valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,569 Commits 24 Branches 182 Tags 341 MiB
35f1266c86
Commit Graph

4185 Commits

Author SHA1 Message Date
Jayesh Kariya
697099c469 adding memcached unit test case 2015-02-03 16:57:53 +05:30
Jayesh Kariya
f9d43f5adc resolved pylint errors 2015-02-03 14:41:32 +05:30
Jayesh Kariya
b1bf62ae74 adding ldapmod unit test case 2015-02-03 14:18:42 +05:30
Jayesh Kariya
8745225574 adding munin unit test 2015-02-03 14:17:14 +05:30
Jayesh Kariya
24c9004023 adding moosefs unit test 2015-02-03 14:00:22 +05:30
Jayesh Kariya
ec88812ed9 adding logrotate unit test 2015-02-03 13:59:01 +05:30
Jayesh Kariya
d1b4fce53e removed pylint error 2015-02-03 13:34:01 +05:30
Jayesh Kariya
3ad563df91 adding locate unit test case 2015-02-03 12:06:11 +05:30
Jayesh Kariya
9d2dd056a6 adding keyboard unit test case 2015-02-03 12:04:47 +05:30
Jayesh Kariya
1ae01547e3 adding iptables unit test case 2015-02-03 12:02:56 +05:30
Mike Place
68418d79a7 Typo 2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809 Better detection for minimum pyzmq version 2015-02-02 13:52:26 -07:00
Nicole Thomas
4b94cfb4dc Merge pull request #20269 from rallytime/refactor_localemod_tests 
Fix broken localemod_test on develop
 2015-02-02 12:56:56 -07:00
rallytime
a99b030e36 Mock salt.utils.which call 2015-02-02 11:55:11 -07:00
Jayesh Kariya
f021c43e97 adding introspect unit test case 2015-02-02 19:17:24 +05:30
Thomas S Hatch
cefb78efe9 Merge pull request #17883 from s0undt3ch/features/pylint-py3-modernize 
[Don't merge yet] Py3 compat changes & Update pylintrc to load the py3modernize plugin
 2015-01-31 03:13:53 -07:00
rallytime
310e9075bf Pylint disable StrictVersion import error 2015-01-30 17:32:17 -07:00
rallytime
3dbe1b30d6 Fix broken localemod_test on develop 
- Fixed failing gen_locale test
- Refactor test to match refactored gen_locale function
- Break out gen_locale tests into inividual unit tests
 2015-01-30 17:23:32 -07:00
Pedro Algarvio
cc064fdc4a Py3 compatibility 2015-01-30 23:37:36 +00:00
Pedro Algarvio
0bc66403b9 Py3 compatibility 2015-01-30 23:37:00 +00:00
Pedro Algarvio
44e255f489 Py3 compatibility 2015-01-30 23:36:34 +00:00
Pedro Algarvio
4443cba9ed Py3 compatibility 2015-01-30 23:36:15 +00:00
Pedro Algarvio
04db610033 Py3 compatibility 2015-01-30 23:35:22 +00:00
Mike Place
710bb63103 Typo 2015-01-30 16:02:56 -07:00
Mike Place
69c5e1f904 Better detection for minimum pyzmq version 2015-01-30 16:01:59 -07:00
Pedro Algarvio
29b519fe88 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
a983495a26 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
98a61ff6d7 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
6030335844 Py3 compatibility 2015-01-30 22:27:16 +00:00
Pedro Algarvio
92d321b732 Py3 compatibility 2015-01-30 22:27:15 +00:00
Pedro Algarvio
95ef4fd9a1 Py3 compatibility 2015-01-30 22:27:15 +00:00
Pedro Algarvio
2a850bc6cb Options should not be globally defined. Do the right thing. 2015-01-30 22:27:15 +00:00
Pedro Algarvio
1c8490bcf9 Py3 compatibility 2015-01-30 22:27:15 +00:00
Pedro Algarvio
da39293b8b Py3 compatibility 2015-01-30 22:27:14 +00:00
Pedro Algarvio
5c8e966b92 Py3 compatibility 2015-01-30 22:27:14 +00:00
Pedro Algarvio
34c75b1a8d The dictionary changes while iterating. Run over a list of keys. 2015-01-30 22:27:14 +00:00
Pedro Algarvio
51c2823168 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
c1215a27a8 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
ccf0cdacc8 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
fd7452b405 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
ddad0bc18c Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
4324550e55 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
0edc28b743 Py3 compatibility and proper assert 2015-01-30 22:27:13 +00:00
Pedro Algarvio
42ec407084 Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
7668c956cc Py3 compatibility 2015-01-30 22:27:13 +00:00
Pedro Algarvio
c5ea080c28 Py3 compatibility 2015-01-30 22:27:12 +00:00
Pedro Algarvio
74801c80db Py3 compatibility 2015-01-30 22:27:12 +00:00
Pedro Algarvio
582d21bc67 Py3 compatibility 2015-01-30 22:27:12 +00:00
Pedro Algarvio
a262f5e960 Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
49878a997c Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
a124936afc Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
26337ad676 Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
822cc12dc8 Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
cedf7f07fb Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
4be7c0e190 Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
60f556d1bf Py3 compatibility 2015-01-30 22:27:11 +00:00
Pedro Algarvio
20e6ccd8d0 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
43f4a9b8e1 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
db20280f73 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
102a6cec51 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
8aa62808a0 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
dc434a2022 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
2f1ebc8fce Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
2961c07901 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
ac15f12349 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
4a25daa211 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
ff636249f4 Py3 compatibility 2015-01-30 22:27:10 +00:00
Pedro Algarvio
47fef41681 Py3 compatibility 2015-01-30 22:27:08 +00:00
Pedro Algarvio
89d283fbf0 Py3 compatibility 2015-01-30 22:27:08 +00:00
Pedro Algarvio
030fbeba5e Py3 compatibility 2015-01-30 22:27:08 +00:00
Pedro Algarvio
a655f36166 Py3 compatibility 2015-01-30 22:27:08 +00:00
Pedro Algarvio
d86131640c Py3 compatibility 2015-01-30 22:27:07 +00:00
Pedro Algarvio
4c68041667 Py3 compatibility 2015-01-30 22:27:07 +00:00
Pedro Algarvio
0120acab0e Py3 compatibility 2015-01-30 22:27:07 +00:00
Pedro Algarvio
00efed4293 Py3 compatibility 2015-01-30 22:27:07 +00:00
Pedro Algarvio
6f61a08485 Py3 compatibility 2015-01-30 22:27:07 +00:00
Pedro Algarvio
bae0d9d385 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
f43a60dfe6 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
fed632f878 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
509aa12c3e Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
9d5d29282a Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
e4a4410930 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
a2ae43a2f8 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
8e4c7847a5 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
e465353aa1 Py3 compatibility 2015-01-30 22:27:06 +00:00
Pedro Algarvio
931acecd19 Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
482016eea3 Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
6b0c88e3bf Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
378752402d Make pylint ignore invalid-sequence-index 2015-01-30 22:25:32 +00:00
Pedro Algarvio
7791067379 Lint fix 2015-01-30 22:25:32 +00:00
Pedro Algarvio
afaf028f9a Py3 compatibility fixes. Skip tests if no mock available. 2015-01-30 22:25:32 +00:00
Pedro Algarvio
4831efcbd6 Py3 compatibility fixes. Proper test module imports setup. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
6ccbcccd72 Py3 compatibility fixes. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
36d058bda9 Py3 compatibility fixes. Skip tests if no mock available. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
03763d65b4 Py3 compatibility fixes. Skip tests if no mock available. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
ca06f278eb Py3 compatibility fixes. 2015-01-30 22:25:31 +00:00
Pedro Algarvio
3942da1c9c Py3 compatibility fixes. 2015-01-30 22:25:30 +00:00
Pedro Algarvio
5dab3e0d7d Py3 compatibility fixes. 2015-01-30 22:25:29 +00:00
Pedro Algarvio
dc2d3b8ba2 The imports do work! 2015-01-30 22:25:29 +00:00
Pedro Algarvio
1bcda11f3d Py3 compatibility fixes. 2015-01-30 22:25:28 +00:00
Pedro Algarvio
b3807f5b22 Py3 compatibility fixes. 2015-01-30 22:25:28 +00:00
Pedro Algarvio
788bb913c6 Py3 compatibility fixes. 2015-01-30 22:25:28 +00:00
Pedro Algarvio
79be964dc2 We need to write something, even an empty string 2015-01-30 22:25:19 +00:00
Pedro Algarvio
e6ab1d4ba1 Fix import 2015-01-30 22:25:19 +00:00
Pedro Algarvio
fdd2a3e246 Correct the iteration 2015-01-30 22:25:19 +00:00
Pedro Algarvio
de4a9fefa4 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
63dc6ae7d5 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
0037eda794 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
6d04942a96 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
fd040355c5 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
d3acb194df Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
5242e7217a Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
f13718f11c Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
72654ad0a9 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
85b66a47c5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
a8ff8fa0b5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
8081170d8d Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
0ead7d0f9b Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
a8bc298260 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
282aeb1d35 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fee4a62c87 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
46add23cc1 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
403abc88e1 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
91d185153c Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
5d570561fd Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
665127c932 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
fda912f2d8 Py3 compatibility fixes 2015-01-30 22:25:10 +00:00
Pedro Algarvio
7360164558 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
fcd9832863 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
ec93519312 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
f07427a0ed Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b54c02930f Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
8fa37d65eb Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
b791dd6971 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
81ae50fac0 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
eca6f730db Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
207f3ddbf1 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
4ae7e918e9 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
f5928068b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3624b911b3 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
a75470a913 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
56840f9a08 Py3 compatibility fixes 2015-01-30 22:25:08 +00:00
Pedro Algarvio
3f24dcfa80 Import six at a later stage 2015-01-30 22:25:07 +00:00
Pedro Algarvio
e0549ca602 Fix import 2015-01-30 22:25:06 +00:00
Pedro Algarvio
fe454d4132 Py3 compatibility fixes 2015-01-30 22:25:06 +00:00
Pedro Algarvio
c0dd5564a5 Py3 compatibility fixes 2015-01-30 22:25:06 +00:00
Pedro Algarvio
c3d922bdc4 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
0726464344 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
1a779fd51c Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
309876eac1 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f3bc5bdb49 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
fdc467b587 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
a4e48e8873 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
2d8b216bcd Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
53a5f4beb8 Py3 compatibility fixes 2015-01-30 22:25:05 +00:00
Pedro Algarvio
f59d669a58 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
4eadb88bfa Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0bc44131e8 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
0577610258 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
dd146ca3e5 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
Pedro Algarvio
5bc0c157b6 Py3 compatibility fixes 2015-01-30 22:25:04 +00:00
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
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -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
Thomas S Hatch
9698e49930 Merge pull request #20180 from jayeshka/guestfs-unit-test 
adding guestfs unit test case
 2015-01-29 10:39:20 -07:00
Thomas S Hatch
b469df1b28 Merge pull request #20172 from jacksontj/develop 
Fix for #20170
 2015-01-29 10:32:38 -07:00
Mike Place
d772ddb2bf Add some logging to flaky test 
We need to see what's happening in the echo server to figure out why
this occasionally fails.
 2015-01-29 10:27:31 -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
Thomas Jackson
3d1ae49d09 Pass opts not an ImmutableDict of opts 2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Thomas Jackson
975dee5bdd Remove test as well 2015-01-28 17:25:35 -08:00
Thomas S Hatch
daba06fac2 Merge pull request #20162 from rallytime/bp-20062 
Backport #20062 to 2014.7
 2015-01-28 15:06:07 -07:00
Thomas S Hatch
0b47a56773 Merge pull request #20000 from terminalmage/fix-19552 
Better check for pillar for jinja templating
 2015-01-28 14:35:56 -07:00
Thomas S Hatch
f71714f212 Merge pull request #19729 from jacksontj/develop 
Runner compatibility
 2015-01-28 14:29:42 -07:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
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
a717549c4e Merge pull request #20116 from rallytime/merge_forward_to_fifteen 
Merge 2014.7 into 2015.2
 2015-01-28 12:15:08 -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
rallytime
592ff1c748 Add extension_modules to mocked __opts__ in test_sock_path_len 2015-01-28 09:20:26 -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
Mike Place
2fc1452be6 Merge pull request #20125 from cachedout/pydsl_copy 
Avoid file cache problem in pydsl tests
 2015-01-27 14:32:21 -07:00
Mike Place
dc538853c6 Avoid file cache problem in pydsl tests 
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
 2015-01-27 14:30:56 -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 Jackson
4db02487f1 Pass opts not an ImmutableDict of opts 2015-01-27 13:11:01 -08:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -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
f7f4966420 Merge pull request #20073 from cachedout/gpg_test 
GPG test fix
 2015-01-27 10:31:34 -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
4ab2489bbb Merge pull request #20062 from cachedout/test_runner_timeout 
Increae default runner timeout to 60s
 2015-01-27 09:54:54 -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
Thomas S Hatch
d199edde20 Merge pull request #20076 from rallytime/fix_states_file_tests 
Add some mocked variables to fix the file_test failures
 2015-01-26 20:38:53 -07:00
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
Erik Johnson
59e7481e2b Fix TestSaltCacheLoader tests 
Similar fixes as made for TestGetTemplate
 2015-01-26 16:04:21 -06:00
Mike Place
e3bf4bb6ee GPG test fix 
Now with 100% fewer race conditions
 2015-01-26 14:12:35 -07:00
rallytime
cdc8039b58 Add some mocked variables to fix the file_test failures 
Also do a little clean up of states/file.py and salt/state.py
 2015-01-26 14:11:56 -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
Erik Johnson
d34c0c7787 Fix jinja tests 
With recent edits to the jinja templating system, file_roots and
pillar_roots are referenced, so they need to be in the mocked opts dict.
 2015-01-26 13:10:05 -06:00
Mike Place
0b38efaaad Increae default runner timeout to 60s 2015-01-26 10:59:55 -07:00
Mike Place
c30c3ac418 Forcefully reset the highstate stack on each pydsl test 2015-01-26 10:43:53 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Pedro Algarvio
20e67986b3 Fix calls using user instead of runas. Make use of user. 2015-01-24 03:16:52 +00:00
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
Thomas S Hatch
a8544afa1c Merge pull request #20018 from cachedout/pydsl_separate 
Split a test out into its own class to keep it from colliding
 2015-01-23 17:14:55 -07:00
Colton Myers
c331a3c5cc 644 permissions 2015-01-23 16:59:09 -07:00
Justin Findlay
63369b0a1d reenable ddns_test 2015-01-23 16:04:52 -07:00
Mike Place
b2ef5292c0 Lint 2015-01-23 15:49:02 -07:00
Mike Place
ffa004a26c Fix exception that happens inside jinja renderer during test run 2015-01-23 15:49:02 -07:00
Mike Place
df4b369e30 Split a test out into its own class to keep it from colliding 
Otherwise, setUp/tearDown clobbers the class var in HighState, resulting
in frequent failures.
 2015-01-23 15:49:02 -07:00
Colton Myers
dd61682968 Fix runtests permissions 2015-01-23 14:22:19 -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