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
Thomas S Hatch
c79871e77d
Merge pull request #19637 from s0undt3ch/develop
...
Merge branch '2015.2' into develop
2015-01-12 11:33:14 -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
Pedro Algarvio
c3bc043b23
Merge branch '2015.2' into develop
...
Conflicts:
salt/syspaths.py
setup.py
tests/integration/__init__.py
2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Thomas Jackson
e35c7ac313
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-10 16:32:24 -08:00
Thomas Jackson
d352057f11
Pylint fix
2015-01-10 16:31:59 -08:00
Thomas Jackson
c17462d062
Caste jid as str (its an int all over), and change runner tag to correct prefix
2015-01-10 16:30:00 -08:00
Mike Place
0e935486de
Merge pull request #19605 from jacksontj/develop
...
Fixes for develop
2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d
Temporarily change this test to work around race condition in the runnerclient
...
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Mike Place
1277b71e2d
Typo
2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Thomas S Hatch
98cc0f88b4
Merge pull request #19585 from cachedout/async_flag_for_test_run
...
Async flag for test run
2015-01-09 17:50:52 -07: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
Mike Place
7aec24e8e1
Typo
2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264
Async flag and test cleanup
2015-01-09 13:14:33 -07:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -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
Mike Place
1526d1e788
Merge pull request #19574 from rallytime/better_test_fix
...
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 11:39:42 -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
rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -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
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -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
41841701e7
Fix djangomod.py integration test failures
2015-01-08 12:57:11 -07:00
rallytime
2443d11282
Change file perms back to executable
2015-01-08 12:56:27 -07:00
rallytime
8eab15780e
Change file perms on runtests.py
2015-01-08 12:56:17 -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
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -07: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
Mike Place
d6ce858c23
Try giving some rest tornado requests a little more time
2015-01-08 10:04:19 -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
rallytime
5490530504
Change the install package to fix pip tests
2015-01-08 09:32:53 -07: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
6dcd749b2b
Merge pull request #19494 from cachedout/fix_failing_postgres
...
Some expressions are not so regular
2015-01-07 16:11:27 -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
Thomas S Hatch
a60ce30962
Merge pull request #19455 from jfindlay/split_uwsgi
...
split uwsgi command
2015-01-07 13:51:45 -07:00
Justin Findlay
d8785de0fd
fix uwsgi test
2015-01-07 11:57:44 -07:00
rallytime
4e87557748
--local is not available in older versions of git
...
Also adjust the tests:
subprocess.check_output is only available in python 2.7
2015-01-07 11:56:43 -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
rallytime
fe4fd7a5a3
Use skip_if_binaries_missing decorator
2015-01-07 10:11:26 -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
Thomas S Hatch
a0225079a5
Merge pull request #19324 from whiteinge/git_pillar-branch-env-mapping
...
Added git_pillar branch to environment mapping
2015-01-07 10:06:30 -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
rallytime
98a290ab04
Fix file permissions pylint error
2015-01-07 08:52:32 -07:00
rallytime
5f6af88afb
Merge branch '2015.2' into 'develop'
2015-01-07 07:54:10 -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
Pedro Algarvio
06fdee00c8
Merge pull request #19426 from rallytime/merge_forward_fifteen
...
Merge forward 2014.7 into 2015.2
2015-01-07 09:27:40 +00:00
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
80b07f3578
Merge branch '2014.7' into '2015.2'
...
Conflicts:
tests/buildpackage.py
2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc
Merge pull request #19425 from s0undt3ch/2014.7
...
Ignore the file perms lint check
2015-01-06 18:22:01 -07:00
Nicole Thomas
5abf095fc7
Merge pull request #19418 from rallytime/fix_more_develop_tests
...
Fix blockdev module unit tests
2015-01-06 18:19:43 -07:00
rallytime
cb5375043c
Change file perms back to executable
2015-01-07 01:16:34 +00:00
Pedro Algarvio
a9eaf187e1
Ignore the file perms lint check
2015-01-07 01:15:56 +00:00
rallytime
c50402709b
Change file perms on runtests.py
2015-01-07 01:15:02 +00:00
Mike Place
98e07c0642
Revert "Fix failing blockdev test"
2015-01-06 18:02:55 -07:00
Mike Place
72c5e019af
Fix failing blockdev test
2015-01-06 18:00:51 -07:00
rallytime
69d484d65d
pylint fix
2015-01-07 00:57:50 +00:00
sjwehry
342608d9bd
Fixed spelling of "below" in 9 different files.
2015-01-06 19:55:28 -05:00
rallytime
194c0696aa
Fix my pylint errors
2015-01-06 17:27:38 -07:00
Seth House
e96654744f
Added test for git_pillar branch to env mappings
2015-01-06 16:51:58 -07:00
rallytime
f40affd5d9
Fix blockdev module unit tests
2015-01-06 23:00:12 +00:00
Mike Place
75c067432f
Add debugging to jenkins script
2015-01-06 15:29:21 -07:00
rallytime
ed3a34624c
Fix djangomod.py integration test failures
2015-01-06 22:26:46 +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
rallytime
73ef44dd9f
Pylint fix for 2014.7 branch
2015-01-06 11:14:06 -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
Pedro Algarvio
f377a74fa2
Remove unused script
2015-01-06 17:54:23 +00:00
Thomas S Hatch
00e9686488
Merge pull request #19303 from cachedout/batch_ckminions
...
Batch ckminions
2015-01-06 10:37:42 -07:00
Thomas S Hatch
a7a5362798
Merge pull request #19370 from Seveland12/develop
...
fixed typo in tests/consist.py
2015-01-06 10:22:55 -07:00
Thomas S Hatch
41bef7771e
Merge pull request #19356 from rallytime/bp-19340
...
Backport #19340 to 2014.7
2015-01-06 10:17:49 -07:00
Thomas S Hatch
e31cd4208a
Merge pull request #19352 from rallytime/bp-19280
...
Backport #19280 to 2014.7
2015-01-06 10:16:25 -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
sjwehry
8eb6de4e09
fixed typo in tests/consist.py
...
fixed typo in tests/consist.py
2015-01-05 20:01:16 -05:00
rallytime
f6243f0b80
Fix the test in the correct place...
2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860
Fix pip state test failure
2015-01-05 15:20:18 -07:00
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
Mike Place
0194fbe77c
Attempt to fix inconsintent VT test by preventing a spin
2015-01-05 13:35:02 -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
Mike Place
f44e46d080
Adjust batch test
2015-01-05 10:04:15 -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
rallytime
57514d824b
Fix pylint on 2014.7 branch
2015-01-03 21:44:09 -07:00
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
Thomas S Hatch
7d3a37d82c
Merge pull request #19246 from cachedout/more_cleanup
...
More cleanup
2014-12-30 11:50:12 -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
d9ad877d82
Merge pull request #19286 from cachedout/change_test_enc
...
There is no support for ECDSA on OpenSSH < 5.7.
2014-12-29 19:10:24 -07:00
Mike Place
0f6e94ab6d
There is no support for ECDSA on OpenSSH < 5.7.
...
This breaks tests on several platforms.
2014-12-29 17:53:46 -07:00
Thomas S Hatch
4274a338e5
Merge pull request #19265 from jfindlay/log_color
...
add color option to console logger
2014-12-29 15:43:35 -07:00
Mike Place
e4d96cdd37
Merge pull request #19283 from cachedout/check_kmod_ioerror
...
Check kmod ioerror
2014-12-29 12:42:53 -07:00
Mike Place
5b02fd1cc1
Don't patch path existence
2014-12-29 12:41:58 -07:00
Mike Place
845546c009
Holiday lint
2014-12-29 11:27:05 -07:00
Mike Place
e5fb81970d
Attempt to fix inconsintent VT test by preventing a spin
2014-12-29 10:26:48 -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
cd1239a2d7
Merge pull request #19238 from jfindlay/ensure_cmd
...
update cmd state and module integration tests
2014-12-28 13:28:17 -07: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
Justin Findlay
13dca4548b
fix utils unit test
2014-12-27 18:22:11 -07:00
Justin Findlay
feb3049aa8
pylint again (why was this not caught the first time?)
2014-12-27 14:23:25 -07:00
Justin Findlay
415f0785db
pylint fixes
2014-12-27 14:11:01 -07:00
Justin Findlay
751e0c7f43
update color name consistency
2014-12-27 12:20:08 -07:00
Justin Findlay
32f5f245ca
finally remove global, unused color declarations
2014-12-27 12:20:08 -07:00
Mike Place
9303e48f4b
Change mysql pillar test to use updated class name
2014-12-24 11:19:22 -07:00
Rupesh Tare
42d6a26121
implimented unit test cases for mount module
2014-12-24 19:42:00 +05:30
Justin Findlay
4748156ed9
update cmdmod integration tests
2014-12-23 13:59:25 -07:00
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
Colton Myers
7fc1cc2ba2
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/topics/releases/2014.7.1.rst
salt/modules/mdadm.py
salt/modules/mine.py
salt/modules/win_firewall.py
salt/modules/win_groupadd.py
salt/modules/win_service.py
salt/modules/win_system.py
salt/modules/win_useradd.py
salt/runners/jobs.py
tests/unit/modules/mdadm_test.py
2014-12-22 13:33:53 -07:00
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
Mike Place
a931dd63fe
Increasing sleep to see if it fixes vt test
2014-12-19 14:01:20 -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
Mike Place
28252ba0b8
Merge pull request #19131 from cachedout/fix_pip_tests
...
Fix failing tests in develop
2014-12-19 11:46:14 -07:00
Nitin Madhok
fa5834b564
Change patches to all test functions
2014-12-19 13:38:42 -05:00
Mike Place
7ff6c22b9b
Remove deprecated tests
2014-12-19 11:37:56 -07:00
Mike Place
05fed01430
Fix failing tests in develop
2014-12-19 11:05:47 -07:00
David Cournapeau
509bc7f4ae
STY: add encoding in test module as well.
2014-12-19 09:53:34 -08:00
Mike Place
516c3ec9bc
Merge pull request #19096 from basepi/merge-forward
...
Merge forward from 2014.7 to develop
2014-12-19 10:29:50 -07: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