valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,488 Commits 24 Branches 182 Tags 341 MiB
65fb454757
Commit Graph

3543 Commits

Author SHA1 Message Date
Pedro Algarvio
a6c3915049 Fix order for proper diff on failure 2015-01-24 03:16:51 +00:00
Pedro Algarvio
da7fefaea6 Fix mock calls 2015-01-24 03:16:51 +00:00
Pedro Algarvio
5d35f856ac We no longer warn. 2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
d9c9eb1a6a Yet even more test fixing. *sigh* 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
Mike Place
f14eeaabc1 Fix more failing tests 2015-01-24 03:16:50 +00:00
Mike Place
a8e6bd24e9 Fix failing pip tests 2015-01-24 03:16:49 +00:00
Colton Myers
c331a3c5cc 644 permissions 2015-01-23 16:59:09 -07:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7 Merge pull request #19972 from rallytime/bp-19746 
Backport #19746 to 2015.2
 2015-01-22 17:55:27 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state. 
Include integration tests.
 2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d Add comment. 2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-22 14:24:29 -07:00
rallytime
670538c9cd But only fix it in the correct place... 2015-01-22 01:22:18 -07:00
rallytime
e4856b6fc7 Fix assertion string in failing linux_lvm unit test 2015-01-22 01:20:16 -07:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2 
Conflicts:
	salt/modules/archive.py
 2015-01-14 14:26:22 -06:00
Thomas S Hatch
7d5d095bae Merge pull request #19719 from terminalmage/archive-fixes 
Fix archive.zip, archive.unzip
 2015-01-14 12:16:55 -07:00
Erik Johnson
24752ffe93 Fix archive tests 2015-01-13 22:19:14 -06:00
Erik Johnson
904f9b6c90 Fix archive tests 
This fixes references to the badly-named legacy zip and unzip functions,
as well as skipping the unrar test when neither unrar and rar are
installed.
 2015-01-13 21:07:23 -06:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07:00
Pedro Algarvio
0ceda58bd6 Fix mock call. 2015-01-12 16:51:02 +00:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
Mike Place
1277b71e2d Typo 2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
Nicole Thomas
e46ccc8210 Merge pull request #19579 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-09 12:51:48 -07:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
 2015-01-09 11:39:09 -07:00
Mike Place
2ee4bead9e Adjust for a possible subtle bug in zeromq 2015-01-09 11:10:02 -07:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests 
Update archive tests to use python_shell=False
 2015-01-08 16:43:09 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
Colton Myers
174290b7aa Add python_shell=False to all the linux_acl mocks 2015-01-08 14:29:41 -07:00
Colton Myers
4f851c99ab Fix gem tests 2015-01-08 14:26:04 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
rallytime
2443d11282 Change file perms back to executable 2015-01-08 12:56:27 -07:00
rallytime
8eab15780e Change file perms on runtests.py 2015-01-08 12:56:17 -07:00
rallytime
a150447b15 pylint fix 2015-01-08 12:56:09 -07:00
rallytime
6f74048688 Fix blockdev module unit tests 2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332 Update archive tests to use python_shell=False 2015-01-08 13:51:47 -06:00
Thomas S Hatch
1e670f7b3e Merge pull request #19478 from thatch45/qp_shell 
shellisms for q and p modules
 2015-01-08 11:54:44 -07:00
Colton Myers
4760dc0fb0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6 Merge pull request #19492 from basepi/shell01 
Set python_shell=false
 2015-01-08 11:45:29 -07:00
Colton Myers
d516dc07a2 Merge pull request #19487 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-08 11:28:20 -07:00