Megan Wilhite
8f7df39181
add onfail multiple test ( #35968 )
2016-08-31 20:40:36 -06:00
Nicole Thomas
5d5fdf973b
Pylint fix for #35930 ( #35950 )
2016-08-31 13:26:14 -06:00
Heghedus Razvan
bf6e1fa097
Add integration test for groupadd module ( #35930 )
...
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-31 13:21:07 -06:00
Pedro Algarvio
f842ddd525
OSX testsuite fixes ( #35948 )
...
* OSX is a bit more restrictive on getting the process information
* OSX says the sockets aren't connected, which is weird, but...
* Close the sockets on OSX
2016-08-31 13:09:51 -06:00
Mike Place
6bcd76bfce
Catch shutdown error in test suite ( #35933 )
...
Change made per @s0undt3ch
2016-08-31 09:35:20 -06:00
Mike Place
24920aa226
Shut down time sync before setting time in tests ( #35900 )
...
* Shut down time sync before setting time in tests
* Lint
* Revert "Lint"
This reverts commit 6e3e6b76908b2c79647c7840fc3981548b2d13fc.
* Lint fix (ugh)
2016-08-31 09:16:39 -06:00
Mike Place
e84cee89b8
Merge pull request #35937 from cachedout/increase_ssh_timeout_again
...
Increase SSH test timeout to 90s from 25s
2016-08-31 21:47:50 +09:00
Mike Place
becaa7d01f
Fix colored output
2016-08-31 21:41:05 +09:00
Mike Place
0b38c75a28
Increase SSH test timeout to 90s from 25s
2016-08-31 21:34:38 +09:00
Mike Place
ed2ef93107
Enable debug logs for ssh tests
...
This might be only temporary but we need to see why some tests are flakey.
2016-08-31 20:42:27 +09:00
Thomas S Hatch
407d164752
Add tests for #22558 ( #35915 )
2016-08-30 17:13:12 -06:00
Mike Place
6725cd458c
Merge pull request #35156 from twangboy/int_states_file
...
Fix integration tests for file state on Windows
2016-08-30 17:45:17 +09:00
Mike Place
353d4b70eb
Merge pull request #35180 from twangboy/int_states_cmd
...
Fix integration tests for cmd state on Windows
2016-08-30 17:44:04 +09:00
Mike Place
cbf927ea7a
Merge pull request #35703 from s0undt3ch/develop
...
Signal handling improvements
2016-08-30 17:37:01 +09:00
twangboy
f1bb655e82
Use returns instead of elses
2016-08-29 16:25:29 -06:00
twangboy
f5e0398cc0
Remove skipIf decorator
2016-08-29 16:13:41 -06:00
twangboy
1f7c4e2a32
Fix other mode tests for Windows
2016-08-29 16:12:06 -06:00
twangboy
ecd58bab06
Fix key error
2016-08-29 16:03:00 -06:00
twangboy
9be5d83a25
fix managed_file_mode test
2016-08-29 15:59:17 -06:00
twangboy
566d9b4982
Close file properly
2016-08-29 15:29:47 -06:00
twangboy
b7263d24b5
Additional cachedout recommendations
2016-08-29 15:22:17 -06:00
twangboy
97f3c1fa71
Add missing import
2016-08-29 14:53:41 -06:00
twangboy
9dfa523cc0
Fix test_symlink for Windows
2016-08-29 14:53:41 -06:00
twangboy
aca27acc9b
Fix test_template_local_file and _noclobber
2016-08-29 14:53:41 -06:00
twangboy
31c983fac5
Fix test_template_local_file_noclobber for Windows
2016-08-29 14:53:41 -06:00
twangboy
a37f250460
Fix a few more tests for Windows
2016-08-29 14:53:41 -06:00
twangboy
85fc2f1adc
Fix test_absent_link, test_managed_contents
2016-08-29 14:53:41 -06:00
twangboy
aafe1aff38
Create missing source for symlink on windows
2016-08-29 14:53:41 -06:00
twangboy
c9acbfee38
Fix jinja
2016-08-29 14:53:41 -06:00
twangboy
cd2ce9fb01
Use Jinja instead of seperate files
2016-08-29 14:53:41 -06:00
twangboy
ba2047e37b
Fix a few more tests
2016-08-29 14:53:41 -06:00
twangboy
64ca61065d
Use IS_WINDOWS instead of salt.utils.is_windows
2016-08-29 14:53:41 -06:00
twangboy
b647630dd3
Add missing @ on decorators
2016-08-29 14:53:41 -06:00
twangboy
56180cf09d
Fix/Skip tests for windows
2016-08-29 14:53:41 -06:00
twangboy
4d4ffac5ae
Gate stuff that makes windows crash
2016-08-29 14:53:41 -06:00
Justin Anderson
ab7e511fd1
Change osmajorrelease back to str ( #35858 )
2016-08-29 11:24:20 -06:00
Mike Place
248776d704
Merge pull request #35655 from raazvvann/dev/rheghedu/shadow
...
shadow module: fix return values && integration test
2016-08-24 17:12:02 +09:00
Justin Anderson
63955392e4
os_family is Suse not SUSE ( #35706 )
2016-08-23 14:55:16 -06:00
Nicole Thomas
28f3ed47ca
Don't assume we have a file to remove in tearDown ( #35709 )
...
Some tests build the state file in the test itself and need to
be removed. However, some tests rely on sls files inside of the
integration file state tree. Therefore, in those tests, we have
nothing to remove.
2016-08-23 14:43:55 -06:00
Pedro Algarvio
85fe1b31d5
Use the terminate_process_pid
helper function
2016-08-23 18:36:27 +01:00
Pedro Algarvio
9cdda5377a
Use the terminate_process_pid
helper function
2016-08-23 18:36:27 +01:00
rallytime
b80ef26cf2
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/minion.py
- salt/modules/cassandra_cql.py
- salt/modules/rsync.py
2016-08-23 10:44:55 -06:00
Heghedus Razvan
21c66afea4
Add integration test for shadow module
...
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2016-08-23 15:34:56 +03:00
Mike Place
21ebc61fac
Use random file instead of log file for cp test
2016-08-23 19:33:45 +09:00
rallytime
1d819d7cc2
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-22 09:29:13 -06:00
Mike Place
187e04e109
Merge pull request #35653 from cachedout/set_computer_desc_retcode
...
Switch to retcode evaluation for set_computer_desc
2016-08-22 20:54:22 +09:00
Mike Place
6e1dcb94ec
Account for differences in output
2016-08-22 20:54:03 +09:00
Mike Place
2708fbc6d2
Lint
2016-08-22 19:00:19 +09:00
Mike Place
19b77442ee
Test a fix for the wheel test
...
I think that what is happening here is that we're using stale grains from a previous test. This should hopefully refresh them and allow this test to succeed.
2016-08-22 17:13:16 +09:00
Mike Place
5b75786208
Switch to using skipIf instead of a custom decorator
2016-08-22 16:36:51 +09:00