Commit Graph

861 Commits

Author SHA1 Message Date
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Thomas S Hatch
dc8aecc4d3 Merge pull request #20252 from jayeshka/incron-unit-test
adding incron unit test case
2015-01-30 10:38:27 -07:00
Thomas S Hatch
7f72eb9fb8 Merge pull request #20251 from jayeshka/ilo-unit-test
adding ilo unit test case
2015-01-30 10:38:09 -07:00
Thomas S Hatch
487394ac30 Merge pull request #20249 from rupeshta/logadm_unit_tests
implemented unit test cases for logadm module
2015-01-30 10:37:41 -07:00
Thomas S Hatch
b407b62a38 Merge pull request #20248 from rupeshta/localemod_unit_tests
implemented unit test cases for localemod module
2015-01-30 10:37:28 -07:00
Thomas S Hatch
dc09c54702 Merge pull request #20247 from rupeshta/launchctl_unit_tests
implemented unit test cases for launchctl module
2015-01-30 10:37:18 -07:00
Jayesh Kariya
378d9656d9 adding incron unit test case 2015-01-30 18:38:56 +05:30
Jayesh Kariya
9a48449d01 adding ilo unit test case 2015-01-30 18:36:58 +05:30
Rupesh Tare
24536cca64 implemented unit test cases for logadm module 2015-01-30 18:28:17 +05:30
Rupesh Tare
3e2b08ca4f implemented unit test cases for localemod module 2015-01-30 18:22:27 +05:30
Rupesh Tare
2c07dbedb9 implemented unit test cases for launchctl module 2015-01-30 18:17:03 +05:30
rallytime
9898fcf613 Merge branch '2015.2' into 'develop'
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
Thomas S Hatch
50aeea25a2 Merge pull request #20183 from jayeshka/htpasswd-unit-test
adding htpasswd unit test case
2015-01-29 10:39:55 -07:00
Thomas S Hatch
6a6bc56958 Merge pull request #20181 from jayeshka/hipchat-unit-test
adding hipchat test case
2015-01-29 10:39:36 -07:00
Jayesh Kariya
0b1bade648 resolved the error 2015-01-29 16:00:21 +05:30
Jayesh Kariya
8cedb4b71d adding htpasswd unit test case 2015-01-29 14:49:32 +05:30
Jayesh Kariya
2ab996d135 adding hipchat test case 2015-01-29 14:25:25 +05:30
Jayesh Kariya
acf1f5ffc6 adding guestfs unit test case 2015-01-29 14:18:38 +05:30
Nicole Thomas
16da23c5e7 Merge pull request #20139 from jayeshka/drbd-unit-test
adding drbd unit test case
2015-01-28 12:40:58 -07:00
Nicole Thomas
be9cac8fd1 Merge pull request #20146 from rupeshta/key_unit_tests
implemented unit test cases for key module
2015-01-28 12:13:00 -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
Nicole Thomas
cfe10ed9d6 Merge pull request #20140 from jayeshka/glusterfs-unit-test
adding glusterfs unit test case
2015-01-28 08:58:58 -07:00
Mike Place
3dcc41de39 Fix sed test 2015-01-28 06:30:39 -07:00
Rupesh Tare
ac4dd17c95 implemented unit test cases for key module 2015-01-28 18:42:31 +05:30
Jayesh Kariya
1718a96d3b adding glusterfs unit test case 2015-01-28 11:30:47 +05:30
Jayesh Kariya
3eda02a5e8 adding drbd unit test case 2015-01-28 11:28:15 +05:30
Justin Findlay
b178ee10c2 lint fixes 2015-01-27 14:32:29 -07:00
Justin Findlay
41dd3307dc fix ddns_test for py26, broken for py3
The way to fix this for py26+py3 compatibility is probably to create a
wrapper for contextlib.nested in something like
salt.utils.contextlib.nested or salt.utils.py3_compat.contextlib.nested.
2015-01-27 14:32:29 -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
Thomas S Hatch
6bb744c067 Merge pull request #20104 from rupeshta/junos_unit_tests
implemented unit test cases for junos module
2015-01-27 10:37:55 -07:00
Thomas S Hatch
6e43cfa816 Merge pull request #20103 from rupeshta/ipset_unit_tests
implemented unit test cases for ipset module
2015-01-27 10:37:47 -07:00
Thomas S Hatch
bf397d12b3 Merge pull request #20094 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-01-27 10:04:51 -07:00
Thomas S Hatch
14b23cf7db Merge pull request #19950 from jayeshka/debian_ip-unit-test
adding unit test case for debian_ip
2015-01-27 09:53:58 -07:00
Rupesh Tare
db0d10f453 implemented unit test cases for junos module 2015-01-27 18:46:07 +05:30
Rupesh Tare
6b8eb2afe1 implemented unit test cases for ipset module 2015-01-27 18:44:13 +05:30
Jayesh Kariya
229a35be08 resolved the errors 2015-01-27 14:39:42 +05:30
Colton Myers
c4da7bdd64 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/client/mixins.py
	salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Justin Findlay
89d27d3054 refactor ddns_test test_update 2015-01-26 15:58:59 -07:00
Justin Findlay
f0573670f9 fix skipIf logic for DDNSTestCase 2015-01-26 13:17:12 -07:00
Justin Findlay
bf24db2d69 fix ddns tests 2015-01-26 12:49:45 -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
Justin Findlay
63369b0a1d reenable ddns_test 2015-01-23 16:04:52 -07:00
Mike Place
41aac973a8 Merge pull request #20007 from cachedout/fix_environ_test
Let's see if this is any better in jenkins
2015-01-23 11:58:48 -07:00
Mike Place
545e17c8f5 Let's see if this is any better in jenkins 2015-01-23 11:00:13 -07:00
Thomas S Hatch
d7a0405a56 Merge pull request #19995 from rupeshta/influx_unit_tests
implemented unit test cases for influx module
2015-01-23 10:41:43 -07:00
Rupesh Tare
3cb7b874ac implemented unit test cases for influx module 2015-01-23 17:59:22 +05:30
Thomas S Hatch
c851b9825c Merge pull request #19966 from rallytime/merge_forward_develop
Merge 2015.2 forward to develop
2015-01-22 17:54:21 -07:00
Thomas S Hatch
2a7505efec Merge pull request #19956 from rupeshta/hadoop_unit_tests
implemented unit test cases for hadoop module
2015-01-22 12:41:08 -07:00