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
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
378752402d
Make pylint ignore invalid-sequence-index
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
3942da1c9c
Py3 compatibility fixes.
2015-01-30 22:25:30 +00:00
Pedro Algarvio
dc2d3b8ba2
The imports do work!
2015-01-30 22:25:29 +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
e0549ca602
Fix import
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
53a5f4beb8
Py3 compatibility fixes
2015-01-30 22:25:05 +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
975dee5bdd
Remove test as well
2015-01-28 17:25:35 -08: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
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
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
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
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
c30c3ac418
Forcefully reset the highstate stack on each pydsl test
2015-01-26 10:43:53 -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
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
d9c9eb1a6a
Yet even more test fixing. *sigh*
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
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
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
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
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
Jayesh Kariya
6b7ff5dcd0
adding git unit test case
2015-01-21 19:15:18 +05:30
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
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
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
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
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
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
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
845271d31c
More linting
2015-01-13 11:15:45 -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
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
c368b88963
Merge pull request #19665 from cachedout/tornado_test_timeout
...
Fix tornado tests
2015-01-12 22:15:03 -07:00
Mike Place
74501f56ae
Fix tornado tests
...
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Aurynn Shaw
b7ae48642a
Adds fire_master to the Salt Event library, for use in 3rd-party code.
2015-01-13 09:29:27 +13:00
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
Thomas S Hatch
91d0b5b75c
Merge pull request #19562 from rupeshta/debconfmod_unit_tests
...
Implemented unit test cases for debconfmod module
2015-01-09 17:14:56 -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
Nicole Thomas
e46ccc8210
Merge pull request #19579 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-09 12:51:48 -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
Mike Place
2ee4bead9e
Adjust for a possible subtle bug in zeromq
2015-01-09 11:10:02 -07:00
Mike Place
cc6c2828ab
Adjust for a possible subtle bug in zeromq
2015-01-09 11:08:39 -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
jfindlay
f329ec9104
Merge pull request #19422 from Seveland12/develop
...
Fixed spelling of "below" in 9 different files.
2015-01-07 09:32:44 -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
