Commit Graph

882 Commits

Author SHA1 Message Date
jfindlay
4234a76d0e Merge pull request #19817 from jfindlay/cassandra_unit_tests
fix cassandra unit tests
2015-01-17 15:10:25 -07:00
Justin Findlay
770258e511 fix environ module unit tests 2015-01-17 15:07:25 -07:00
Justin Findlay
9d18f7a879 fix cassandra unit tests 2015-01-17 14:02:38 -07:00
Thomas S Hatch
1569520a4b Merge pull request #19792 from rallytime/merge_forward_develop
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
Thomas S Hatch
3edd84a244 Merge pull request #19783 from jayeshka/deb_apache-unit-test
adding deb_apache unit test
2015-01-16 17:02:07 -07:00
Thomas S Hatch
d95ec638ef Merge pull request #19808 from jfindlay/mount_unit_tests
Mount unit tests
2015-01-16 16:57:12 -07:00
Justin Findlay
bcdab12b75 fix mount module unit tests
I currently don't have access to an OpenBSD system, so I don't know what
the 6 columns of output of `swapctl -kl` is since some of the outputted
columns are discarded by the mount module, but as they are discarded,
they do not affect the tests of mount.swaps.
2015-01-16 15:40:39 -07:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop'
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Jayesh Kariya
bb6e22999e Adding defaults unit test case 2015-01-16 19:12:19 +05:30
Jayesh Kariya
f245aec8a9 resolved pylint error 2015-01-16 17:39:32 +05:30
Jayesh Kariya
ede0a375df adding deb_apache unit test 2015-01-16 15:00:52 +05:30
Nicole Thomas
0b3c3f84c8 Merge pull request #19780 from rupeshta/event_unit_tests
test event tests
2015-01-16 00:23:44 -07:00
Rupesh Tare
74015f974e test event tests 2015-01-16 11:38:29 +05:30
Rupesh Tare
64b29032af test gnomedesktop tests 2015-01-16 11:20:17 +05:30
Mike Place
0399fc32c2 Fix broken test 2015-01-15 10:06:28 -07:00
Nicole Thomas
f526f61041 Merge pull request #19684 from jayeshka/chef-unittest
adding chef unit test case
2015-01-15 07:57:20 -07:00
Thomas S Hatch
7041530111 Merge pull request #19725 from rupeshta/firewalld_unit_tests
test firewalld tests
2015-01-14 12:18:59 -07:00
Thomas S Hatch
bc639a9f75 Merge pull request #19723 from jayeshka/data_unit_tests
Added unit test for data
2015-01-14 12:18:31 -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
Rupesh Tare
2ab5d0bfdf test genesis tests 2015-01-14 16:29:14 +05:30
Rupesh Tare
8dc9287d5d test firewalld tests 2015-01-14 16:26:23 +05:30
Jayesh
a17dfc96fb Added unit test for data 2015-01-14 15:20:16 +05:30
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
Rupesh Tare
721fffa02c fix pylint errors 2015-01-13 19:54:49 +05:30
Rupesh Tare
f8f28580df test ddns module 2015-01-13 19:00:17 +05:30
Jayesh
87baaa915f adding chef unit test case 2015-01-13 18:23:32 +05:30
Jayesh
d2a5eda14a resolved pylint error 2015-01-13 17:54:45 +05:30
Jayesh
2aa6479d25 adding cpan test case 2015-01-13 15:56:21 +05:30
Thomas S Hatch
b7899b2935 Merge pull request #19058 from cournape/add_darwin_pkg_support
Add darwin pkg support
2015-01-12 11:43:44 -07:00
Pedro Algarvio
eeb6dadc21 Merge branch '2015.2' into develop 2015-01-12 17:13:57 +00: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
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-01-09 17:49:43 -07:00
Colton Myers
35596415b2 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/modules/brew.py
	salt/modules/disk.py
2015-01-09 12:57:49 -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
Rupesh Tare
e5bdbf592c Implemented unit test cases for dnsmasq module 2015-01-09 17:06:59 +05:30
Rupesh Tare
84afffcb0a Implemented unit test cases for debconfmod module 2015-01-09 17:05:13 +05:30
Thomas S Hatch
4ff285a002 Merge pull request #19511 from gracinet/19329-pillar-introspection
Provide modules.pillar.obfuscate and modules.pillar.ls
2015-01-08 16:56:53 -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
a60fa6b3d1 Merge branch '2015.2' into develop 2015-01-08 11:29:08 -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
Mike Place
68b6815883 Another missed quote 2015-01-08 10:16:02 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -07:00
Georges Racinet
e94fe6de31 Mark function as private
With the leading underscore, _obfuscate_inner should be excluded from the CLI
(and the related lint tests)
2015-01-08 17:41:49 +01: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
Rupesh Tare
0de948f03b Implemented unit test cases for cassandra module 2015-01-08 18:57:58 +05:30
Rupesh Tare
27a28e02c7 bug fixing 2015-01-08 14:23:45 +05:30
Georges Racinet
eb70dcf67d Provide modules.pillar.obfuscate and modules.pillar.ls
This fulfills #19329. As explained there, 'ls' is not that useful, but
still including it for completeness.
Also first attempt at writing a unit test within salt.
2015-01-08 09:44:51 +01:00
Mike Place
96fdbc474a Fix postgres test 2015-01-07 22:38:51 -07:00
rallytime
8bf6edcf45 Merge branch '2015.2' into merge_forward_develop 2015-01-07 21:08:40 -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
rallytime
74a1861655 Merge branch '2015.2' into merge_forward_develop 2015-01-07 17:01:25 -07: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
Thomas S Hatch
c9b003ac66 Merge pull request #19445 from rupeshta/devmap_unit_tests
Implemented unit test cases devmap module
2015-01-07 10:21:12 -07:00
Thomas S Hatch
f5572a3308 Merge pull request #19443 from rupeshta/bridge_unit_tests
Implemented unit test cases for bridge module
2015-01-07 10:20:17 -07:00
Thomas S Hatch
48097d7fed Merge pull request #19442 from rupeshta/daemontools_unit_tests
Implemented unit test cases for module daemontools
2015-01-07 10:20:02 -07:00
Thomas S Hatch
3252ca95ce Merge pull request #19441 from rupeshta/composer_unit_tests
Implemeted unit test cases for module composer
2015-01-07 10:19:16 -07:00
Thomas S Hatch
58fd3cc575 Merge pull request #19377 from jayeshka/augeas_cfg_unit_test
adding augeas_cfg unit test case
2015-01-07 10:08:03 -07:00
Rupesh Tare
f231b5dd35 Implemented unit test cases devmap module 2015-01-07 18:49:12 +05:30
Rupesh Tare
73ccbf6b37 Implemented unit test cases fordebian_service module 2015-01-07 18:46:47 +05:30
Rupesh Tare
94f6372678 Implemented unit test cases for bridge module 2015-01-07 18:07:36 +05:30
Rupesh Tare
a760eaea4a Implemented unit test cases for module daemontools 2015-01-07 17:56:06 +05:30
Rupesh Tare
7a83039a5a removed unused import 2015-01-07 17:42:56 +05:30
Rupesh Tare
24e1e40550 Implemeted unit test cases for module composer 2015-01-07 17:39:00 +05:30
Rupesh Tare
09b6088b62 Implemented unit test cases for module environ 2015-01-07 17:21:17 +05:30
Jayesh
2d3e40d69a added check for augeas python package 2015-01-07 14:19:35 +05:30
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Mike Place
1700450dd8 Merge pull request #19432 from cachedout/fix_group_test
Allow for variations in distros in group test
2015-01-06 22:05:53 -07:00
Mike Place
309f91a979 Allow for variations in distros in group test 2015-01-06 22:04:19 -07:00
Mike Place
f06b5ae344 Merge pull request #19427 from cachedout/kmod_skip
Skip kmod test if /etc/modules isn't present
2015-01-06 20:37:39 -07:00
Mike Place
22ccbf0542 Skip kmod test if /etc/modules isn't present 2015-01-06 20:36:45 -07:00
rallytime
69d484d65d pylint fix 2015-01-07 00:57:50 +00:00
rallytime
f40affd5d9 Fix blockdev module unit tests 2015-01-06 23:00:12 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
2015-01-06 14:16:15 -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
Mike Place
170ce2a6f3 Merge pull request #19396 from cachedout/remove_unused_import_in_cp
These were unused and causing weird recursion errors in unit tests
2015-01-06 11:04:25 -07:00
Mike Place
c706ed279c These were unused and causing weird recursion errors in unit tests 2015-01-06 11:03:21 -07:00
Thomas S Hatch
b01ac59df6 fix bad lint error 2015-01-06 10:13:47 -07:00
Thomas S Hatch
ab0b432d94 Merge branch 'apache_unit_test' of https://github.com/jayeshka/salt into jayeshka-apache_unit_test 2015-01-06 10:11:50 -07:00
Rupesh Tare
8c5148af42 writing unit test cases for cassandra module 2015-01-06 19:40:30 +05:30
Jayesh
508ec1adea removed pylint error in augeas_cfg unit test case 2015-01-06 11:49:48 +05:30
Jayesh
2edf731c97 adding augeas_cfg unit test case 2015-01-06 11:19:36 +05:30
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
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test
Adding unit tests for salt.modules.zpool
2015-01-05 10:11:46 -07:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests
adding extfs unit test
2015-01-03 20:20:09 -07:00
Thomas S Hatch
0e9c7ecf28 Merge pull request #19274 from rupeshta/drac_unit_tests
implimented code for drac module
2014-12-30 12:10:51 -07:00
Jayesh
f14cfa9235 adding useradd unit test case. 2014-12-30 12:18:25 +05:30
Jayesh
2928d87cef resolved lint errors in extfs unit test 2014-12-30 11:48:43 +05:30
Mike Place
5b02fd1cc1 Don't patch path existence 2014-12-29 12:41:58 -07:00
Rupesh Tare
722b43116e implimented code for drac module 2014-12-29 19:54:00 +05:30
Jayesh
b71372d4f1 adding extfs unit test 2014-12-29 19:29:41 +05:30
nmadhok
6d8aa5f00e Adding unit tests for salt.modules.zpool 2014-12-28 22:25:03 -05:00
Thomas S Hatch
763c0f600a Merge pull request #19217 from jayeshka/hosts_unit_tests
Hosts unit tests
2014-12-28 13:06:47 -07:00
Thomas S Hatch
845e123c95 Merge pull request #19174 from jayeshka/kmod_unit_tests
adding kmod module unit tests
2014-12-28 13:00:18 -07:00
Rupesh Tare
42d6a26121 implimented unit test cases for mount module 2014-12-24 19:42:00 +05:30
Nitin Madhok
9f601484bf Fixing unit tests for mdadm 2014-12-23 11:31:58 -07:00
Jayesh
92f36aa396 adding hosts unit test 2014-12-23 15:43:17 +05:30
Jayesh
f53666d15a error resolved in kmod unit test case 2014-12-23 14:48:13 +05:30
Jayesh
050e454167 adding hosts unit test case 2014-12-23 11:53:19 +05:30
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
Jayesh
4b7faa44ad adding kmod module unit tests 2014-12-22 17:32:24 +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
David Cournapeau
509bc7f4ae STY: add encoding in test module as well. 2014-12-19 09:53:34 -08: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