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
Mike Place
545e17c8f5
Let's see if this is any better in jenkins
2015-01-23 11:00:13 -07:00
rallytime
69d7a6ebd0
Pylint fixes for the 2015.2 branch
2015-01-23 10:57:18 -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
9cdbf2b2f7
Merge pull request #19972 from rallytime/bp-19746
...
Backport #19746 to 2015.2
2015-01-22 17:55:27 -07:00
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
54a394d4e6
Merge pull request #19965 from lyft/support-sns-subscriptions
...
Support sns subscriptions
2015-01-22 17:53:28 -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
Mathias Gug
f4c75375f4
Make sure boto_sns state is idempotent.
2015-01-22 12:13:33 -08: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
Thomas S Hatch
4ebc8c881a
Merge pull request #19955 from rupeshta/img_unit_tests
...
implemented unit test cases for img module
2015-01-22 12:40:51 -07:00
Thomas S Hatch
d488c06b72
Merge pull request #19952 from rupeshta/http_unit_tests
...
implemented unit test cases for http module
2015-01-22 12:40:16 -07:00
Thomas S Hatch
70cdb3e43b
Merge pull request #19951 from rupeshta/hg_unit_tests
...
implemented unit test cases for hg module
2015-01-22 12:39:32 -07:00
rallytime
2fc1cdc83e
Merge branch '2015.2' into merge_forward_develop
2015-01-22 12:21:36 -07:00
Mathias Gug
85ec021a73
Merge remote-tracking branch 'upstream/develop' into support-sns-subscriptions
...
Conflicts:
tests/integration/states/boto_sns.py
2015-01-22 11:11:51 -08:00
Mathias Gug
b79756bdd5
Support subscriptions in sns topic state.
2015-01-22 11:04:31 -08:00
Jayesh Kariya
a870cb073b
removed get_interface error
2015-01-22 19:32:10 +05:30
Rupesh Tare
3a2ced7160
implemented unit test cases for hadoop module
2015-01-22 16:34:02 +05:30
Rupesh Tare
e4cb6ca551
implemented unit test cases for img module
2015-01-22 16:21:09 +05:30
Rupesh Tare
2493ccc09e
implemented unit test cases for http module
2015-01-22 16:13:18 +05:30
Rupesh Tare
c93c21e8b0
implemented unit test cases for hg module
2015-01-22 16:10:22 +05:30
Jayesh Kariya
7e7afe3b32
adding unit test case for debian_ip
2015-01-22 16:02:41 +05:30
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
Jayesh Kariya
a685e2ea2b
adding dpkg unit test case
2015-01-22 12:05:49 +05:30
Thomas S Hatch
8f8ff4e7ed
Merge pull request #19918 from jfindlay/fix_ddns_tests
...
fix ddns tests
2015-01-21 13:16:49 -07:00
Justin Findlay
d4547bc025
fix skipIf typo
2015-01-21 12:37:51 -07:00
Thomas S Hatch
0eff1e46d6
Merge pull request #19867 from rupeshta/grub_legacy_unit_tests
...
implemented unit test cases for module grub_legacy
2015-01-21 12:20:51 -07:00
Justin Findlay
5f3f2f3bae
fix ddns tests
...
These tests will only work if dnspython is installed. Mocking away
dnspython is a great amount of work, so we'll just disable these tests
for now.
2015-01-21 12:17:09 -07:00
Thomas S Hatch
f365e89207
Merge pull request #19900 from jayeshka/git-unit-test
...
adding git unit test case
2015-01-21 10:57:26 -07:00
Pedro Algarvio
8dbb7394b2
White-space lint fix
2015-01-21 14:17:03 +00:00
Jayesh Kariya
6b7ff5dcd0
adding git unit test case
2015-01-21 19:15:18 +05:30
Pedro Algarvio
b0920b226e
We still support Python 2.6, so, we need indexes.
2015-01-21 02:11:48 +00:00
Thomas S Hatch
a41b20fb9c
Merge pull request #19868 from rupeshta/glance_unit_tests
...
implemented unit test cases for glance module
2015-01-20 16:09:34 -07:00
Thomas S Hatch
c49361a1f0
Merge pull request #19863 from jayeshka/djangomod-unit-test
...
adding djangomod unit test case
2015-01-20 16:06:35 -07:00
Thomas S Hatch
8bfb79c8d9
Merge pull request #19812 from matthew-muscat/develop
...
Update hosts file creation for consistency and improved readability
2015-01-20 14:52:01 -07:00
Rupesh Tare
87eba66086
implemented unit test cases for glance module
2015-01-20 18:05:09 +05:30
Rupesh Tare
b18b1887f0
implemented unit test cases for module grub_legacy
2015-01-20 17:59:51 +05:30
Jayesh Kariya
346eb73f5c
adding djangomod unit test case
2015-01-20 15:21:21 +05:30
jfindlay
8133907a62
Merge pull request #19786 from jayeshka/defaults-unit-test
...
Adding defaults unit test case
2015-01-17 20:35:37 -07:00
jfindlay
d04dee8443
Merge pull request #19685 from rupeshta/ddns_unit_tests
...
test ddns module
2015-01-17 20:34:27 -07:00
Justin Findlay
eaa704cf47
change perms on some tests/ files
2015-01-17 19:32:43 -07:00
jfindlay
d7d15e3a60
Merge pull request #19821 from jfindlay/debian_service_unit_tests
...
fix debian service unit tests
2015-01-17 17:47:18 -07:00
jfindlay
8ea53a73eb
Merge pull request #19822 from jfindlay/dnsmasq_unit_test
...
fix dnsmasq unit tests
2015-01-17 17:44:47 -07:00
Justin Findlay
9202cbba78
fix dnsmasq unit tests
2015-01-17 15:44:45 -07:00
jfindlay
b42029b3c6
Merge pull request #19819 from jfindlay/environ_unit_tests
...
fix environ unit tests
2015-01-17 15:42:21 -07:00
Justin Findlay
555dbd66ab
fix debian_service unit tests
2015-01-17 15:31:52 -07:00
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
Matthew Muscat
f44d67471d
Update hosts module test
...
Update test case to account for formatting changes in b82001fcd4
2015-01-18 00:33:00 +11: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
fab600add9
Merge pull request #19746 from lyft/add-boto-sns-module
...
Add boto_sns module and state.
2015-01-16 16:58:09 -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
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08: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
Mathias Gug
effc9488f5
Merge branch 'develop' of github.com:saltstack/salt into add-boto-sns-module
2015-01-16 10:02:52 -08: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
bb3c1714f8
Style fixes
2015-01-15 10:48:44 -07:00
Mike Place
6d14d4e661
Fix broken test
2015-01-15 10:41:08 -07:00
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
Mathias Gug
64cf74ebaa
Fix style.
2015-01-14 16:05:36 -08:00
Mathias Gug
6ffc9f827e
Fix style.
2015-01-14 16:04:25 -08:00
Mathias Gug
e5ab359bdd
Fix style issues.
2015-01-14 16:02:50 -08:00
Mathias Gug
6f9fbe23d6
Add boto_sns module and state.
...
Include integration tests.
2015-01-14 15:43:06 -08:00
Thomas S Hatch
3a89e67488
Merge pull request #19735 from lyft/add-aws-account-id-function
...
Add get_account_id function boto_iam
2015-01-14 16:20:36 -07:00
Mathias Gug
97d0f93fd3
Fix coding style.
2015-01-14 13:06:43 -08: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
Mathias Gug
30625a0437
Skip boto_iam integration tests if boto is not available
...
or properly configured.
2015-01-14 11:49:54 -08: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
Mathias Gug
61eeac5465
Add comment.
2015-01-14 11:12:23 -08:00
Mathias Gug
3ff36a9692
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-14 11:08:54 -08: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
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
Mike Place
845271d31c
More linting
2015-01-13 11:15:45 -07:00
Thomas S Hatch
a16824ec48
Merge pull request #19680 from jayeshka/cpan-unit-tests
...
adding cpan test case
2015-01-13 08:26:31 -07:00
Thomas S Hatch
f1391fb8d9
Merge pull request #19667 from cachedout/ssh_tests
...
Fix tests
2015-01-13 08:14:34 -07: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