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,700 Commits 24 Branches 182 Tags 341 MiB
0aa6ecfb7f
Commit Graph

8491 Commits

Author SHA1 Message Date
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-30 10:13:39 -06:00
Mike Place
5252ec99a9
Workaround for interference between loader test and yaml test 2016-09-30 22:28:49 +09:00
Mike Place
16f5bb70ec
Remove line that checks against unordered keys 2016-09-30 20:24:49 +09:00
Mike Place
e685519e1a Merge pull request #36639 from skizunov/develop2 
Port the 'rabbitmq' module to Windows
 2016-09-30 19:20:26 +09:00
msiebeneicher
c067c7e5b6 fixed pylint issues 2016-09-30 11:07:52 +02:00
msiebeneicher
37e11f8071 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
* 'develop' of https://github.com/saltstack/salt:
  Fix traceback when checking command whitelist/blacklist
  tests.integration.__init__: except psutil error
  archive.extracted: Use `user`/`group`, not `archive_user`
  Better merge conflict fix: pass **params to consul.Consul in consul_pillar.py
  Add consul host, port, and token values back in with conf.get()
  Minor: syntax error fixes.
  Improve and fix `_check_cache_minions`
  Backport of PR #36589 / Issue #36588 to 2016.3 branch.
  Add support for ACL Tokens in consul_pillar with the option consul.token
  Add version_cmp for FreeBSD pkg.
 2016-09-30 10:17:20 +02: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
7a03c4df8c Fix merge conflict resolution error 
The original conflict resolution adjusted the wrong line. This puts
the test changes on the correct line and restores the original line.
 2016-09-29 11:26:50 -06:00
rallytime
6bc3221f7b Update test to not use the nested context (for Py3 compat) 2016-09-29 11:25:46 -06:00
Sergey Kizunov
7337ddb1a4 Updated rabbitmq module unit test 
Updated to track changes to the rabbitmq module for the Windows
port.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-29 11:15:02 -05:00
rallytime
c01be1ca80 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/states/file.py
 2016-09-29 10:09:05 -06:00
msiebeneicher
8c8ac46b74 added unit tests for state.show_state_usage functionality 2016-09-29 18:06:45 +02: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
Denys Havrysh
bba9d0d105 alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03: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
Mike Place
ccd92d22d2 Merge pull request #36621 from terminalmage/fix-shadowed-builtins 
Fix shadowed builtins
 2016-09-29 11:25:54 +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
Erik Johnson
62729eff8d Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
Mike Place
d9672cd206 Merge pull request #36399 from cachedout/test_shutdown2 
Test shutdown
 2016-09-28 17:53:43 +09:00
Mike Place
83da81cdfd Merge pull request #36620 from rallytime/fix-36553 
Don't allow mercurial states to return True with errors
 2016-09-28 14:50:50 +09:00
Erik Johnson
283aca8f2a Update test to reflect new function signature 2016-09-27 23:13:19 -05:00
rallytime
90c66ef756 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/service.py
 2016-09-27 21:34:10 -06:00
rallytime
a828bdd0b8 Update test mocks for cmd.run_all dicts 2016-09-27 20:55:39 -06:00
Mike Place
cf16d82ba2 Merge pull request #36602 from alexbleotu/get_datacenter-gh 
Get datacenter gh
 2016-09-28 11:47:00 +09:00
Mike Place
4ab52ae0f6 Merge pull request #36607 from vutny/detect-service-fail 
`salt.states.service`: detect that service failed to start/stop
 2016-09-28 11:39:51 +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
Jonathan Ballet
79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter 2016-09-27 18:52:49 +02:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03:00
rallytime
07921cc3c6 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-27 08:39:48 -06:00
Alexandru Bleotu
03533e9b01 Added tests for salt.utils.vmware.get_datacenter 2016-09-27 13:39:47 +01: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
Mike Place
681ce7539c Merge pull request #36511 from alexbleotu/wait_for_task_update-gh 
Wait for task update gh
 2016-09-26 19:04:35 +09:00
Mike Place
6af9192a51 Merge pull request #36509 from alexbleotu/get_root_folder-gh 
Get root folder gh
 2016-09-26 18:52:50 +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
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Alexandru Bleotu
16510be521 Updated tests to reflect changes in salt.utils.vmware.wait_for_pid 2016-09-23 10:48:24 +01:00
Alexandru Bleotu
fa2ecb9f56 Added tests for get_root_folder 2016-09-23 10:09:10 +01:00
Mike Place
654fa8d770 Merge pull request #36280 from jwplayer/feature/2016.3-better-postgresql-grants 
Feature/2016.3 better postgresql grants
 2016-09-23 16:55:32 +09: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
90ef5ce499 Merge pull request #36492 from rallytime/test-fixes-carbon 
The "assert_called_once" mock testing function is only available in mock 2.0.0 or greater
 2016-09-23 00:56:59 +09:00
Mike Place
761ee8b3f6 Merge pull request #36476 from cro/vmware_fix2 
Allow VMware salt-cloud driver to list objects again
 2016-09-22 13:16:40 +09: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
C. R. Oldham
755c069fb9 Align tests for new calls 2016-09-21 16:08:28 -06:00
rallytime
18c6a736cf The "assert_called_once" mock testing function is only available in mock 2.0.0 or greater 
We have a couple of tests using the "assert_called_once" function, however, our salt-jenkins
states pin the version of mock at 1.0.1 (This is the last version that is compatible with
Python 2.6). We either need to use something else that works for all versions of mock or gate
the test.

In the pacman tests, it is possible to use "assert_called_with" instead of "assert_called_once"

In the dimension_data and gce unit tests, we need to gate the assertion behind a mock version check.
This way the tests won't fail if the version of mock installed is less than 2.0.0.
 2016-09-21 14:46:50 -06: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
C. R. Oldham
3c62ceb3b4 Fix salt-cloud breakage--local traversal was skipping what we needed. Fixes #36301 
Align tests for new calls
More specific 'skip' selection for PropertyCollector depending on local_properties request.
 2016-09-21 09:43:14 -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
3d23371ca2 Merge pull request #36459 from cachedout/pr-36426 
Pr 36426
 2016-09-21 15:34:28 +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
2b49a45768 Merge pull request #36431 from cachedout/psutil_os_x 
Try/except psutil process access in OSX
 2016-09-20 22:05:42 +09:00
Mike Place
67b78c7d97 Merge pull request #36423 from kraney/boto_apigateway_usage_plan 
Boto apigateway usage plan
 2016-09-20 15:47:03 +09: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
Robert James Hernandez
85d2068326 Refactor for testing and adding related engine tests 2016-09-19 17:10:19 -07:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Winston Liu
df8648d5e3 lint clean up's. 2016-09-19 14:52:41 -07:00
kbelov
632de87807 Merge branch 'boto_apigateway_usage_plan' of https://github.com/kraney/salt into boto_apigateway_usage_plan 2016-09-19 14:38:59 -07:00
kbelov
b61dc5abda added unit tests for boto_apigateway module for usage plans and usage plan associations 2016-09-19 14:37:52 -07: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
Winston Liu
962b0439a5 rest of the unit tests for usage plans related functionality in boto_apigateway module. 2016-09-19 10:54:38 -07: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
Winston Liu
37a0f17191 unit tests for describe/create usage plan. 2016-09-19 09:43:36 -07: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