valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,233 Commits 24 Branches 182 Tags 341 MiB
21921af9a7
Commit Graph

3134 Commits

Author SHA1 Message Date
rallytime
21921af9a7 Skip pkg.upgrade test if pkg install/upgrade has problems 
Refs #36450
 2016-10-13 11:57:27 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
Andrew Pashkin
337119c113 Fix integration tests launching - remove redundant "config_dir" argument in call to ShellTestCase.run_run from SaltDaemonScriptBase._wait_until_running 2016-10-12 13:21:40 -06:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades 
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
 2016-10-11 16:50:50 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Mike Place
bd712bb0ff
Fix test suite hanging on shutdown 2016-10-05 17:14:27 +09:00
Mike Place
8ff69bf0c7 Merge pull request #36764 from cachedout/more_pip_test_fixing 
Another bit of detection for failed pip tests
 2016-10-04 22:05:29 +09:00
Mike Place
b9f5343449
Another bit of detection for failed pip tests 
Don't bail out if the download failed for some reason on the remote end
 2016-10-04 21:09:47 +09:00
Justin Findlay
b5fcca9983 modules.archive int tests: check for gzip, rar 
Similar to 8733586.
 2016-10-03 11:14:05 -06:00
Mike Place
93f1daa4ce Merge pull request #36744 from cachedout/fix_test_shutdown 
Fix issue where test suite could hang on shutdown
 2016-10-04 00:37:00 +09:00
Mike Place
cdf2a56564
Fix issue where test suite could hang on shutdown 
This is most common in the develop branch but could occur here as well.
 2016-10-03 23:37:05 +09:00
C. R. Oldham
e6897da166 Skip test if we can't get an earlier package. 2016-09-30 17:30:21 -06:00
C. R. Oldham
8e68058877 Handle cases where the return dict from a pkg.upgrade might have a "changes" key. 2016-09-30 16:33:56 -06:00
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
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
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
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
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
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
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