valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,688 Commits 24 Branches 182 Tags 341 MiB
56e86a6e04
Commit Graph

3296 Commits

Author SHA1 Message Date
rallytime
5904cc04c6 Skip cmd_unzip test if salt.utils.which('zip') isn't available 
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
 2016-09-30 16:02:42 -06:00
Nicole Thomas
52276d37a1 Skip cmd_unzip test if salt.utils.which('zip') isn't available (#36722) 
This test relies on running archive.cmd_zip in order to have something
to test running archive.cmd_unzip against. Some distros will have the
unzip binary available, but not the zip binary. We need to protect this
test against both so we don't have a false failure on trying to run
archive.cmd_zip.
 2016-09-30 14:30:09 -06:00
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-30 10:13:39 -06:00
Mike Place
16f5bb70ec
Remove line that checks against unordered keys 2016-09-30 20:24:49 +09:00
Mike Place
0e9148293a
Fix error in test 
Introduced in #36616

cc: @cro
 2016-09-30 11:38:03 +09:00
rallytime
616aafa398 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-29 11:47:48 -06:00
rallytime
c01be1ca80 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/states/file.py
 2016-09-29 10:09:05 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
rallytime
3e4ac617d3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/cli/grains.py
  - tests/integration/files/file/base/issue-2068-template-str-no-dot.sls
  - tests/integration/files/file/base/issue-2068-template-str.sls
  - tests/integration/modules/pip.py
 2016-09-29 09:15:26 -06:00
Mike Place
3d098c64ef
Remove possible race between grains dumps in test 
It's not always reasonable assume that grains will be the same byte-for-byte
between invocations. Remove that assumption since it isn't related to the what's under test here anyhow.
 2016-09-29 15:34:50 +09:00
Mike Place
8cfe371a5a Merge pull request #36663 from cachedout/skip_pip_tests_on_download_fail 
Fix error in pip test
 2016-09-29 15:15:52 +09:00
Mike Place
0c7fb91dc5
Fix error 2016-09-29 15:14:37 +09:00
Mike Place
e3f8618982 Merge pull request #36662 from cachedout/skip_pip_tests_on_download_fail 
Skip over tests where upstream pip isn't there
 2016-09-29 15:12:26 +09:00
Mike Place
0bbc60ccd7
Skip over tests where upstream pip isn't there 2016-09-29 15:11:38 +09:00
Mike Place
3249a11e71 Merge pull request #36661 from cachedout/fix_grain_test_race 
Fix race between minion job timeout and cli test timeout
 2016-09-29 13:42:23 +09:00
Mike Place
2dcb92134d
Fix race between minion job timeout and cli test timeout 2016-09-29 13:23:26 +09:00
Mike Place
f4906fe771
Fix test not to rely on external resources 
We can still model the original issue without needing to call all the way out to pypi to do it.
 2016-09-29 12:35:02 +09:00
Mike Place
d8a61eb9f6 Merge pull request #36616 from cro/zypper_fix_test 
Zypper fix test
 2016-09-29 11:26:22 +09:00
Justin Findlay
cc4d958557 modules.archive: add integration tests 2016-09-28 17:14:52 -06:00
C. R. Oldham
b618a5c07d Remove debugging 2016-09-28 16:26:56 -06:00
Justin Findlay
74c518668b tests.integration.__init__: except psutil error 
Related to d0f44c9.
 2016-09-28 15:58:33 -06:00
Mike Place
d9672cd206 Merge pull request #36399 from cachedout/test_shutdown2 
Test shutdown
 2016-09-28 17:53:43 +09:00
C. R. Oldham
3870589462 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:50:44 -06:00
C. R. Oldham
867638ff48 Test for pkg.upgrade. Most robust on Suse but better than nothing elsewhere 2016-09-27 14:49:23 -06:00
rallytime
07921cc3c6 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-27 08:39:48 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
Mike Place
3a83b0bd16
Remove tests which no longer apply 
The point of these tests originally was to verify the proper location
of a log file. Checking return codes is just spurious and ties the test
too closely with the shutdown behavior of the daemons which are tracked and tested
in other places more closely and with more accuracy.
 2016-09-27 16:36:24 +09:00
Mike Place
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop 2016-09-26 21:47:32 +09:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
 2016-09-23 17:01:17 -06:00
rallytime
861a001749 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-23 15:06:28 -06:00
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
Nicole Thomas
fcc50c93fc Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537) 
Since all pieces of the GrainsAppendTestCase are destructive, let's
just wrap the whole class test case.

Because the tests themselves as well as the `tearDown` function were
wrapped in a @destructiveTest decorator, some test errors were printing
in the test output when --run-destructive isn't passed at the CLI.

This fixes those test errors.
 2016-09-23 13:35:05 -06:00
rallytime
7fdc73136c Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-22 17:03:24 -06:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-22 10:09:06 -06:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-22 10:01:17 -06:00
Mike Place
9d032e0a1b Merge pull request #36481 from terminalmage/fix-mac-non-string-arg-handling 
Fix mac non-string arg handling
 2016-09-22 13:14:18 +09:00
Mike Place
85907ef008 Merge pull request #36485 from gtmanfred/carbon 
clean up keystone tests
 2016-09-22 13:12:36 +09:00
Daniel Wallace
8deb342488 clean up keystone tests 
Don't want to overwrite the stuff for the glance tests
 2016-09-21 14:43:42 -05:00
Erik Johnson
1c585b0ef6 Leave arguments as integers 
This should be supported, and helped catch a bug in the extraneous
re-implementation of cmd.run_all that exists in salt.utils.mac_utils.
 2016-09-21 11:46:54 -05:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
 2016-09-21 10:43:38 -06:00
rallytime
8805b57a1e Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-21 09:32:53 -06:00
rallytime
e92478c211 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-21 09:20:42 -06:00
Mike Place
41d3c09857 Merge pull request #35433 from terminalmage/issue34790 
git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
 2016-09-21 16:02:18 +09:00
Mike Place
a41022efc3 Merge pull request #36447 from jfindlay/bp-36431 
Backport #36431: Try/except psutil process access in OSX
 2016-09-21 14:52:39 +09:00
Mike Place
487aae25b5 Lint 2016-09-20 12:50:39 -06:00
Mike Place
9d2eab47c1 Try/except psutil process access in OSX 
Refs https://github.com/saltstack/qa/issues/244
 2016-09-20 12:50:39 -06:00
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
 2016-09-20 10:43:55 -06:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
 2016-09-20 10:39:53 -06:00
Mike Place
ae1fc430c2 Merge pull request #36424 from jfindlay/bp-36194 
skip some mac_timezone tests
 2016-09-20 15:43:47 +09:00
Mike Place
6c1b3f5af4
Lint 2016-09-20 15:40:00 +09:00
Mike Place
d0f44c95f5
Try/except psutil process access in OSX 
Refs https://github.com/saltstack/qa/issues/244
 2016-09-20 14:35:25 +09:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Erik Johnson
aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0 
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
 2016-09-19 14:27:30 -06:00
Thomas S Hatch
5625827ee2 Merge pull request #36378 from terminalmage/issue36321 
git.latest Treat an up-to-date checkout with local changes as up-to-date
 2016-09-19 12:43:29 -06:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-19 11:22:54 -06:00
rallytime
bdb15217d3 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-19 11:21:02 -06:00
Erik Johnson
bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (#36391) 
* git.latest: fail gracefully for misconfigured remote repo

When the remote repo's HEAD refers to a nonexistent ref, this was
causing a traceback when we tried to check if the upstream tracking
branch needed to be changed after cloning the repo. This commit fixes
this traceback by gracefully failing the state when the remote HEAD is
not present in the ``git ls-remote`` output, but the desired remote
revision doesn't exist.

Additionally, a similar graceful failure now happens if the state is run
again after we gracefully fail the first time, and we need to set the
tracking branch. Trying to set the tracking branch when there is no
local branch would fail with an ambiguous error like "fatal: branch
'master' does not exist", so before we even attempt to set the tracking
branch, the state is failed with a more descriptive comment.

* Add integration test for #36242
 2016-09-19 09:33:00 -06:00
Mike Place
6cced56ad3
Lint 2016-09-19 19:08:58 +09:00
Mike Place
db8bef4261
Join in eventassert 2016-09-19 19:02:07 +09:00
Mike Place
d5656e030a
Fast test shutdown 2016-09-19 18:59:03 +09:00
Erik Johnson
71b51f49ba Add integration tests for PR #35433 2016-09-17 22:55:47 -05:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05:00
Justin Anderson
b2a1779383 Close open socket on freebsd 2016-09-15 15:37:00 -06:00
rallytime
47e5d94710 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-15 11:26:09 -06:00
Mike Place
52e9ba4076 Revert "Skip some tests on MacOS" (#36341) 2016-09-15 11:12:04 -06:00
Thomas S Hatch
d69878127e Merge pull request #36284 from jfindlay/mac_skip 
Skip some tests on MacOS
 2016-09-15 09:46:30 -06:00
Erik Johnson
d9726f73a7 Remove reference to no-longer-skipped test 2016-09-15 08:57:38 -05:00
Erik Johnson
83cb406cc9 Merge branch 'twangboy-mac_pip_tests' into carbon 2016-09-15 08:56:49 -05:00
Erik Johnson
55fb5f4d2f Merge branch 'mac_pip_tests' of https://github.com/twangboy/salt into twangboy-mac_pip_tests 2016-09-15 08:56:21 -05:00
Erik Johnson
f4dded464c Ensure we have a test venv created using virtualenv < 13.0 
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
 2016-09-14 22:42:39 -05:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 15:18:22 -06:00
Justin Findlay
30fd9a622a skip pip weird install test 2016-09-14 14:40:43 -06:00
Justin Findlay
d0c4846c89 skip tests that timeout on MacOS 
Due to the changes in how the test daemons are handled, it seems.  The
tests fail intermittently.
 2016-09-14 14:40:43 -06:00
rallytime
dd1769ea58 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/file.py
  - salt/runners/cloud.py
  - salt/utils/gitfs.py
 2016-09-14 13:08:42 -06:00
rallytime
9e15df9b23 Switch the order of the decorator 
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
 2016-09-14 12:12:21 -06:00
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 09:53:10 -06:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install 
Refs #35907
 2016-09-14 09:25:56 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
rallytime
fb994ad92f Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 09:00:05 -06:00
Mike Place
dde623bfd5 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 15:43:39 +09:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 14:32:15 +09:00
Mike Place
8119eb6a41 Merge pull request #36269 from gtmanfred/carbon 
begin adding tests for the openstack cloud provider
 2016-09-14 14:24:42 +09:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262) 
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 15:24:06 -06:00
Erik Johnson
fd28ca058f Fix for new integration test for fileserver.clear_file_list_cache 
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.

This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
 2016-09-13 15:55:51 -05:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263) 
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 12:40:56 -06:00
twangboy
c01ec228e1 Skip weird_install test on Mac OS X 2016-09-13 11:35:38 -06:00
Daniel Wallace
2d716131da Add test to check openstack in libcloud 
With apache-libcloud 0.20.0
 2016-09-13 10:25:43 -05:00
Daniel Wallace
b488cf2420 add __main__ function for keystone test 2016-09-13 10:23:04 -05:00
rallytime
e385f55588 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-13 08:25:11 -06:00
rallytime
e6a412dd49 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-13 08:23:51 -06:00
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525 
Splat serializer default configs into the serializer kwargs
 2016-09-13 18:21:46 +09:00
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests 
Fix test_launchctl test in mac_service
 2016-09-13 16:31:46 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150 
Add a runner function to clear fileserver list caches
 2016-09-13 09:17:05 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests 
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
 2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -06:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-12 09:42:26 -06:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
twangboy
28442b32f8 Fix some lint 2016-09-09 08:47:51 -06:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
rallytime
2edfef33ae Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
 2016-09-08 17:31:29 -06:00
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -06:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests 
Fix tests for mac_power module on various systems.
 2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests 
Fix test not starting, skip broken functions
 2016-09-08 14:42:48 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-08 13:03:12 -06:00
David Boucha
64a576fc6e add windows core grain test 2016-09-07 21:22:24 -06:00
Mike Place
eac9935b58 Merge pull request #36044 from Ch3LL/add_test_state_event 
add salt-run state.event test
 2016-09-08 10:23:49 +09:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
rallytime
40d0def479 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/states/archive.py
 2016-09-07 10:11:36 -06:00
Ch3LL
ee398a94b6 fix pylint 2016-09-07 10:05:44 -06:00
Mike Place
ff04c162bd Skip Ruby tests on exception in pre-req check 2016-09-07 14:32:47 +09:00
Mike Place
dfcc14ad45 A more liberal search minion strings in manage test 
Correct falures where the formatting is slightly different.
 2016-09-07 12:37:29 +09:00
plastikos
dde85e1144 Various fixes for MacOS X (#36085) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:30:08 -06:00
plastikos
1101e30389 Various fixes for MacOS X (#36080) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:29:26 -06:00
Ch3LL
4afc82ac63 add salt-run state.event test 2016-09-06 15:16:16 -06:00
Thomas S Hatch
40081176af Merge pull request #34529 from Ch3LL/add_skip_verify_archive 
Add skip_verify for archive.extracted
 2016-09-06 15:05:31 -06:00
twangboy
9e0f45785a Fix some lint 2016-09-06 15:02:02 -06:00
twangboy
ca414e01de Fix capitalization error in setUp and tearDown 2016-09-06 15:02:02 -06:00
twangboy
af3f70d877 Seperate sleep on power button test 2016-09-06 15:02:02 -06:00
twangboy
c2b42f69c1 Move test available into their own classes 2016-09-06 15:02:02 -06:00
twangboy
efb425781f Fix lint errors 2016-09-06 15:02:02 -06:00
twangboy
35dd0619cb Check string type 2016-09-06 15:02:02 -06:00
twangboy
701031ff40 Fix sleep_on_power test 2016-09-06 15:02:02 -06:00
twangboy
5e19d4664a Check the availablity of individual tests 2016-09-06 15:02:02 -06:00
twangboy
d0d36bb874 Fix syntax error (lint) 2016-09-06 15:02:02 -06:00
twangboy
9be71e5a5d Check for Desktop, fix some functions 2016-09-06 15:02:02 -06:00
Nicole Thomas
e7e1330d02 Merge pull request #36075 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-06 13:46:33 -06:00
Mike Place
e79c42e515 Fix signal handling (#36067) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-06 11:30:21 -06:00
Erik Johnson
9ae753f6ed Use self.run_run instead of self.run_run_plus 
Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
 2016-09-03 14:59:04 -05:00
Erik Johnson
ab9a89d6dc Add test for jid in runner ret events (zh 858) 2016-09-03 14:59:04 -05:00
Erik Johnson
92d6d4ab75 Fix incorrect key for return data 
The return data from run_run_plus previously returned the runner return
in the ``fun`` key. This has since been corrected. This commit replaces
these references to the ``fun`` key with the corrected ``return`` key.
 2016-09-03 14:59:04 -05:00
Erik Johnson
5673395f0c Update usage of run_run_plus to remove unused "options" argument 2016-09-03 14:59:04 -05:00
Erik Johnson
d4059a0d79 Update the run_run_plus docstring 2016-09-03 14:59:04 -05:00
Erik Johnson
74d5f3aa51 Remove unused argument 2016-09-03 14:59:04 -05:00
Erik Johnson
a4e96cfb7a Don't execute the runner twice in run_run_plus 
Instead, compile output by executing salt.output.display_output() on the
return data obtained from executing the runner via the Python API.
 2016-09-03 14:59:04 -05:00
Erik Johnson
f41db032a2 Add ability to reload client_config to run_run_plus 
This allows one to pass a kwarg to run_run_plus called
``__reload_config`` which will be passed as the ``from_scratch``
argument to self.get_config(). This allows self.run_run_plus() to force
a reload of the master config for integration tests which require the
config to be reloaded, for instance, from master.d/*.conf.
 2016-09-03 14:59:04 -05:00
Erik Johnson
230c684d4c Add test case for runner returns 2016-09-03 14:59:04 -05:00
Erik Johnson
070e5f3c48 Fix typo, add return and jid to run_run_plus 
Also make kwargs work (they were being ignored)
 2016-09-03 14:59:03 -05:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-09-02 09:43:40 -06:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
Justin Anderson
9f7994ea40 Suse user state test fix (#36009) 2016-09-01 16:28:13 -06:00
Justin Anderson
e6b4dd651e Suse Useradd test fix (#36007) 2016-09-01 15:57:03 -06:00
Heghedus Razvan
1a38cc340c shadow: test set&delete password for root (#35929) 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-09-01 11:25:44 -06:00
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
rallytime
d7380d83be requires_system_grains decorator needs a grains=None kwarg 2016-08-31 11:35:02 -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
a238666aba Add serializer test 2016-08-31 23:16:40 +09: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
Ch3LL
38203e3d2c add tornado web app to serve up static file for test 2016-08-30 15:43:28 -06:00
rallytime
b20f6b9384 Catch CommandExecutionError when group_installed doesn't exist 
Includes an integration test to make sure this doesn't regress.

Fixes #35819
 2016-08-30 11:44:17 -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