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
49,663 Commits 24 Branches 182 Tags 341 MiB
81a0d4c915
Commit Graph

863 Commits

Author SHA1 Message Date
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469 
Backport #21469 to 2014.7
 2015-03-11 15:05:08 -06:00
Ross Perkins
d473408074 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:17 -07:00
Ross Perkins
3f3218d853 Fix for issue #21491 2015-03-11 11:33:39 -07:00
Ross Perkins
8083cf554d Backport of PR #21358 to 2014.7 2015-03-10 09:38:16 -07:00
Vincent Desjardins
d5293901bc fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-10 09:17:48 -06:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
rallytime
db612d0b81 Clean up some pylint on 2015.2 
This way PRs against 2015.2 will be a little happier
 2015-02-06 07:58:26 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param 
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
 2015-02-05 12:36:42 -07:00
Colton Myers
44bd4fb906 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/cli/__init__.py
 2015-02-03 13:26:11 -07:00
Justin Findlay
8eab04bd69 fix linux_sysctl_test failures caused by #20314 2015-02-03 11:30:27 -07:00
Thomas S Hatch
19b7db40b8 Merge pull request #19914 from jfindlay/shell_false 
change python_shell default to False
 2015-01-28 10:41:16 -07:00
rallytime
03558dc013 Fix some of the mocking on cmdmod_test 
This could still use some more love, but it should help for now.
 2015-01-27 14:15:04 -07:00
Pedro Algarvio
20e67986b3 Fix calls using user instead of runas. Make use of user. 2015-01-24 03:16:52 +00:00
Mike Place
d9c9eb1a6a Yet even more test fixing. *sigh* 2015-01-24 03:16:50 +00:00
Mike Place
a8e6bd24e9 Fix failing pip tests 2015-01-24 03:16:49 +00: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
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
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
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
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
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
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
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Mike Place
bb0c32e44d Another missed quote 
Conflicts:
	tests/unit/modules/postgres_test.py
 2015-01-08 10:17:39 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -07:00
Colton Myers
e7b79de8da Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/ebuild.py
 2015-01-08 09:28:12 -07:00
rallytime
4aa60ce51a Fix linux_acl tests 2015-01-07 20:55:19 -07:00
Erik Johnson
5edba8e55e Add back double-quote 
This is in the actual dig output, I shouldn't have removed it.
 2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338 Fix dig tests 
This fixes the dig tests after dig.py was modified to use
python_shell=False.
 2015-01-07 19:59:16 -06:00
Mike Place
3830162952 Some expressions are not so regular 2015-01-07 15:53:07 -07:00
Thomas S Hatch
0e1683672f first round of pip test updates 2015-01-07 14:54:36 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
 2015-01-07 14:49:58 -07:00
Justin Findlay
d8785de0fd fix uwsgi test 2015-01-07 11:57:44 -07:00
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Colton Myers
56eae4783a Merge branch '2014.7' into merge-forward-2015.2 2015-01-06 13:33:18 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes 
Pylint and psutil unit test fixes for 2014.7 branch
 2015-01-06 13:24:15 -07:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
Nitin Madhok
f20f899b34 Changing return to match zpool list instead of zfs list 2015-01-05 14:05:55 -07:00
nmadhok
44454a3687 Replacing zfs with zpool 2015-01-05 14:05:55 -07:00
nmadhok
8670e399ce Adding unit tests for salt.modules.zpool 2015-01-05 14:05:55 -07:00
Nitin Madhok
9f601484bf Fixing unit tests for mdadm 2014-12-23 11:31:58 -07:00
Thomas S Hatch
6579d447ae Merge pull request #19175 from rupeshta/pw_group_unit_tests 
added unit test cases for pw_group module
 2014-12-22 09:37:32 -07:00
Thomas S Hatch
b8b8eb437f Merge pull request #19129 from nmadhok/unit-tests 
Adding unit tests for zfs.exists and zfs.create [WIP]
 2014-12-22 09:17:35 -07:00
Rupesh Tare
14e5ffe078 added unit test cases for pw_group module 2014-12-22 18:22:04 +05:30
Nitin Madhok
d4de045ede Salt modules must be imported after the ensure in syspath call 2014-12-21 11:44:57 -05:00
Nitin Madhok
2ef5edbbca Moving create success together 2014-12-20 13:04:53 -05:00
Nitin Madhok
4a3ba21201 Indentation 2014-12-20 13:02:21 -05:00
Nitin Madhok
21174f9b48 Adding another unit test to check for zfs.create success when properties are specified 2014-12-20 12:51:19 -05:00
Thomas S Hatch
fc3d15dd6a Merge pull request #19121 from nmadhok/fix-mdadm-create-module 
Fixing salt.modules.mdadm.create broken functionality
 2014-12-19 14:05:11 -07:00
Thomas S Hatch
296d711a5a Merge pull request #19120 from jayeshka/groupadd_unit_tests 
unit test case for groupadd
 2014-12-19 14:04:10 -07:00
Nitin Madhok
16692ad446 Refactor mdadm tests 2014-12-19 13:55:07 -07:00
Nitin Madhok
f1d573c9d8 Forgot to end with quotes 2014-12-19 13:55:06 -07:00
Nitin Madhok
210d1d221f Fixing unit tests for mdadm 2014-12-19 13:55:06 -07:00
Nitin Madhok
95e16247b8 Adding another unit test to check for zfs.create success if create_parent=True 2014-12-19 14:16:19 -05:00
Nitin Madhok
e492962996 Adding another unit test to check for zfs.create failure if the parent datasets do not exist 2014-12-19 14:12:12 -05:00
Nitin Madhok
e46f3f71ed Adding another unit test to check for zfs.create failure if the pool doesnt exist 2014-12-19 14:07:40 -05:00
Nitin Madhok
78ade421aa Adding another unit test to check for zfs.create failure if trailing slash in name is present 2014-12-19 13:58:53 -05:00
Nitin Madhok
d90a4ecf7f Adding another unit test to check for zfs.create failure if dataset name is missing 2014-12-19 13:46:33 -05:00
Nitin Madhok
fa5834b564 Change patches to all test functions 2014-12-19 13:38:42 -05:00
Thomas S Hatch
9fea50e954 Merge pull request #19094 from thatch45/jayeshka-disk_unit_tests 
Merge #18953 with lint fixes
 2014-12-19 10:15:03 -07:00
Nitin Madhok
aa570e3ceb Changing AssertEquals to AssertTrue and AssertFalse 2014-12-19 11:45:16 -05:00
Nitin Madhok
0b8bed6d94 Adding another unit test to check for zfs.create success 2014-12-19 11:04:19 -05:00
Nitin Madhok
2ed539ea61 Adding another unit test to check for zfs.exists failure 2014-12-19 10:36:28 -05:00
Nitin Madhok
5c8a81a166 Adding unit tests for zfs.exists 2014-12-19 10:29:33 -05:00
Nitin Madhok
9027d1fc2f Fixing unit tests for mdadm 2014-12-19 08:55:07 -05:00
Rupesh Tare
255d107d36 added test cases for pw_user module 2014-12-19 18:51:13 +05:30
Jayesh
0b1ea591ed unit test case for groupadd 2014-12-19 12:03:45 +05:30
Thomas S Hatch
6a9195e190 fix bad file perms 2014-12-18 10:42:25 -07:00
Thomas S Hatch
b8f4cc7021 more lint 2014-12-18 10:33:31 -07:00
Thomas S Hatch
cc8705bcba lint 2014-12-18 10:15:58 -07:00
Thomas S Hatch
6afb8b64d6 Merge branch 'disk_unit_tests' of https://github.com/jayeshka/salt into jayeshka-disk_unit_tests 2014-12-18 10:11:01 -07:00
Rupesh Tare
a851d449f5 class name changed 2014-12-18 11:53:10 +05:30
Rupesh Tare
97b53fbcec Merge branch 'develop' into linux_lvm_unit_tests 2014-12-18 11:00:03 +05:30
Rupesh Tare
01ba8b6b46 pylint bug fixing 2014-12-18 10:59:01 +05:30
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Thomas S Hatch
efb087df09 Merge pull request #19051 from nmadhok/fix-module-mdadm-create 
Fixing salt.modules.mdadm.create and correcting incorrect code.
 2014-12-17 14:56:18 -07:00
Nitin Madhok
4cb2fd604c Refactor mdadm tests 2014-12-17 14:27:51 -05:00
Nitin Madhok
c7eee6385b Forgot to end with quotes 2014-12-17 13:48:57 -05:00
Nitin Madhok
502b340553 Fixing unit tests for mdadm 2014-12-17 13:46:34 -05:00
Rupesh Tare
c28620b805 created unit test cases for linux_lvm module 2014-12-17 19:54:11 +05:30
rallytime
b76f49b9d0 Pylint fix and skip all of the classes 2014-12-16 16:21:27 -07:00
rallytime
7f258bf729 Disable zcbuildout tests as they are not running reliably. 
These tests are not running reliably, aren't quite testing the functionalty
the way they should, and take too long to run as unit tests. When these get
reinstated, they should be implemented as integration tests instead of unit
tests.
 2014-12-16 16:00:51 -07:00
Rupesh Tare
8d271b173d added test cases for at and atc function from at module 2014-12-16 19:48:30 +05:30
Rupesh Tare
54bb776f9e Merge branch 'develop' into at_unit_tests 2014-12-15 17:29:54 +05:30
Rupesh Tare
fbafd6fb51 added unit test case for atrm & jobcheck functions from at module 2014-12-15 17:28:58 +05:30
Rupesh Tare
c86bdb6c16 created unit test case for function atq from module at 2014-12-12 19:23:22 +05:30
Jayesh
b69d81ee69 Added test case 2014-12-12 17:20:31 +05:30
Thomas S Hatch
8e281dedcc lint fix 2014-12-11 16:58:10 -07:00
Daniel Hobley
694adda563 Fixed unit tests for archive module 2014-12-11 22:46:36 +01:00
Thomas S Hatch
bcb529f809 Merge pull request #18823 from scalp42/typos 
Correct some typos
 2014-12-09 14:43:15 -07:00
Thomas S Hatch
274aca9b5b Merge pull request #18844 from rallytime/fix_parted_tests 
Patch unittests when calling _validate_device
 2014-12-09 11:46:58 -07:00
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
 2014-12-09 10:59:18 -07:00
rallytime
8211dc2f00 Patch unittests when calling _validate_device 2014-12-09 10:48:02 -07:00
rallytime
db9ae406c3 Fix mocked calls in unit/modules/archive_test.py 
This is due to the changes in #18621
 2014-12-09 08:36:30 -07:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Pedro Algarvio
04fe9382aa Merge pull request #18585 from rallytime/cmd_unittests 
Added some more cmdmod unittests
 2014-12-02 15:54:57 +00:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
rallytime
a26cd377ff More cmdmod unittests 2014-12-01 08:57:11 -07:00
rallytime
c3d90c9f4f If umask=0 is provided, enter the umask if statement 
Previously the 'Zero umask is not allowed' statement was not getting hit
Also updated the appropriate umask tests
 2014-12-01 08:57:10 -07:00
rallytime
98b06be08a Added some more cmdmod unittests 2014-12-01 08:57:10 -07:00
rallytime
e7cdd75090 Add another cmdmod.py unittest 2014-12-01 08:57:10 -07:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c Disable some Pylint errors 2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
9d6c855e1a Disable some Pylint errors 2014-11-28 15:33:45 +00:00
Pedro Algarvio
b07707ff96 Disable some Pylint errors 2014-11-28 15:31:55 +00:00
Pedro Algarvio
8a1cc589a1 Disable some Pylint errors 2014-11-28 15:31:01 +00:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
Pedro Algarvio
b8b4158377 Remove unused import 2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0 Fix imports 2014-11-26 21:08:13 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
 2014-11-26 20:14:56 +00:00
Pedro Algarvio
53f554468d Switch open() for salt.utils.fopen() 2014-11-26 18:28:15 +00:00
Pedro Algarvio
91af550062 Switch open() for salt.utils.fopen() 2014-11-26 18:25:20 +00:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
starzyk1
d6b5b58280 Fixes of pylint violations 2014-11-25 14:22:30 +01:00
starzyk1
4bdede0700 Fixes of pylint violations 2014-11-25 12:49:14 +01:00
starzyk1
50fab573c8 Fixes of pylint violations 2014-11-25 11:51:43 +01:00
rallytime
dc3c8f91bd Pylint fix 2014-11-24 19:44:54 -07:00
rallytime
792433f915 Started some unit tests for the cmdmod.py module 2014-11-24 17:03:52 -07:00
Konrad Starzyk
6656837ff0 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-21 21:52:46 +01:00
Pedro Algarvio
0c50d789b7 The imports actually work so shut up PyLint! 2014-11-20 18:22:19 +00:00
Pedro Algarvio
61de0bd629 Let's see if the slash makes a difference 2014-11-20 17:18:12 +00:00
Pedro Algarvio
8ecd85edcc Mock the right object 2014-11-20 16:40:48 +00:00
Pedro Algarvio
175cba7ff5 Fix imports 2014-11-20 16:40:47 +00:00
Pedro Algarvio
0e4f8de204 Use urlopen from six 2014-11-20 16:40:46 +00:00
Pedro Algarvio
13df58d2e6 Use urlopen and URLError from six 2014-11-20 16:40:45 +00:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
Thomas S Hatch
0ea13995de lint 2014-11-11 10:01:33 -07:00
C. R. Oldham
8b8ab335cc Merge pull request #17317 from cro/pg_role_quote_tests 
Update tests to respect changes in pg module.  Test failures are not related.
 2014-11-10 16:51:43 -07:00
C. R. Oldham
0303154c31 Update tests to respect changes in postgres module 2014-11-10 14:37:44 -07:00
Thomas S Hatch
7300d3ac6a Merge pull request #17291 from ashb/gem_bin 
Allow specifying custom `gem` to use in gem state and module
 2014-11-10 09:37:29 -07:00
Pedro Algarvio
1071ec0859 Merge branch '2014.7' into develop 2014-11-09 14:19:33 +00:00
Pedro Algarvio
ed321a4898 Don't reset the template registry 2014-11-09 14:17:15 +00:00
Ash Berlin
b1e57b82ea Allow specifying custom gem to use in gem state and module 
Better late than never - here is a PR for issue #13202
 2014-11-09 01:06:08 +00:00
Pedro Algarvio
d8315ebd32 Merge branch '2014.7' into develop 2014-11-08 09:39:55 +00:00
Justin Findlay
ba1ce3dfc5 pylint fixes 2014-11-08 00:33:02 -07:00
Justin Findlay
9e9903c521 add unit tests for salt/modules/cp.py 2014-11-07 16:35:25 -07:00
Thomas S Hatch
656817141c Merge pull request #17210 from hulu/typos-galore 
fix numerous typos+misspellings
 2014-11-06 14:25:53 -07:00
Thomas S Hatch
e4be523ee4 Merge pull request #17234 from thatch45/bemehow-get_vpc_id 
Merge #17181
 2014-11-06 14:06:56 -07:00
Thomas S Hatch
1e74ae2c5f lint fixes 2014-11-06 11:05:37 -07:00
Thomas S Hatch
4e49453952 Merge branch 'get_vpc_id' of https://github.com/bemehow/salt into bemehow-get_vpc_id 2014-11-06 11:03:55 -07:00
Chris Rebert
802a631dd9 more typo/misspelling fixes 2014-11-05 15:29:25 -08:00
Chris Rebert
b9bb56841d fix numerous typos+misspellings 2014-11-05 13:57:47 -08:00
Michal Bicz
73f9654018 add module to find vpc id based on cidr, name or tags 2014-11-04 23:38:06 -08:00
Thomas S Hatch
77966c56c1 ilint 2014-11-04 15:18:37 -07:00
Thomas S Hatch
8fcab999dd Merge branch 'vpc_describe' of https://github.com/bemehow/salt into bemehow-vpc_describe 2014-11-04 15:15:51 -07:00
Thomas S Hatch
ff593e30b2 remove duplicate code 2014-11-04 10:05:24 -07:00
Roman Inflianskas
202d3c343a modules.linux_acl: add recursive option for all functions 2014-11-04 19:54:41 +03:00
Thomas S Hatch
8e8b4c6b5c lint 2014-11-04 09:48:58 -07:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
403a8b4cc9 modules.linux_acl: cleanup comments 2014-11-04 14:45:23 +03:00
Roman Inflianskas
b6cbb70e38 modules.linux_acl: add unit tests 2014-11-04 14:45:17 +03:00
Roman Inflianskas
8f409a4180 modules.linux_acl: add unit tests 2014-11-04 14:45:06 +03:00
Roman Inflianskas
16b4e2619f modules.linux_acl: raise exception on no files given; add unit tests 2014-11-04 14:44:44 +03:00
Konrad Starzyk
5b43246ab9 JBoss7 and Artifactory state/modules 2014-11-04 11:16:30 +01:00
Michal Bicz
6c2f21263c added unit tests, used vpc_ids argument instead of filter to find VPC, lint 2014-11-03 23:25:04 -08:00
Roman Inflianskas
f5903dfe6d modules.parted: tests: fixed probe deprecation testing #2 2014-11-03 13:12:46 +03:00
Roman Inflianskas
d04abdf91a modules.parted: tests: fixed probe deprecation testing 2014-11-03 12:30:13 +03:00
Roman Inflianskas
70e4062cf9 Actually testing parted 
called_once_with didn't work, changed to assert_called_once_with
 2014-11-03 11:52:01 +03:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Justin Findlay
26094b39b4 pylint fix on linux_sysctl_test.py 2014-10-31 12:41:04 -06:00
Justin Findlay
f09b8e3873 remove redundant mock_open() in darwin_sysctl_test.py 2014-10-31 10:42:57 -06:00
Justin Findlay
106f645c9e adding tests for modules/linux_sysctl.py 2014-10-31 10:16:41 -06:00
Thayne Harbaugh
65e477dd67 Improve filter_by() base argument: 
* Change filter_by() base argument to a key in lookup_dict rather
    than a dictionary.  This allows more compact usage and more
    readable use of base values/defaults in the lookup_dict.

  * Change/improve function-local documentation for lookup_dict().

  * Add specific use-case of "base" argument for lookup_dict() in the
    formulas documentation.

  * Expand filter_by() unit testing to validate use of base argument.

  * Add unit test for salt.utils.dictupdate.update() to provide
    complete depth-of-testing of filter_by() which uses
    dictupdate.update().
 2014-10-24 11:13:47 -06:00
Mathieu Le Marec - Pasquet
2b4d7e3080 Support for vt in pip & venv modules 2014-10-23 20:18:44 +02:00
Cimarron Mittelsteadt
43fea4f3ea TST: Updated mac_user tests for modifications to OS release handling 2014-10-21 15:00:58 -06:00
Cimarron Mittelsteadt
d6abb6c77d TST: Updated mac_user tests for modifications to OS release handling 2014-10-17 09:28:56 -07:00
rallytime
7e09896c7c Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:35:08 -06:00
rallytime
e15bf67fba Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:03:21 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Gareth J. Greenaway
9ae138e1a4 Fixing the unit tests for ps module 2014-10-07 20:56:02 -07:00
rallytime
6212cfba12 Fix assertion messages to match and pass tests 2014-10-07 09:36:04 -06:00
rallytime
d8e7feafce Clean up last expectedFailure 2014-10-07 08:42:31 -06:00
rallytime
5ff51987b9 Pylint fix 2014-10-07 08:31:42 -06:00
rallytime
868a6e5459 Change expectedFailures to @skipIfs 2014-10-07 08:13:09 -06:00
rallytime
6a1da81a99 Pylint fix 2014-10-06 20:48:00 -06:00