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,358 Commits 24 Branches 182 Tags 341 MiB
71e35d3c82
Commit Graph

8412 Commits

Author SHA1 Message Date
Mike Place
71e35d3c82
Check for a second place a transient error can occur in an SSH test 2016-10-05 16:32:57 +09:00
Mike Place
d2ab4b11b5 Merge pull request #36689 from msiebeneicher/develop 
Feature :: provide state.show_state_usage call
 2016-10-03 20:53:01 +09:00
Mike Place
5252ec99a9
Workaround for interference between loader test and yaml test 2016-09-30 22:28: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
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
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
Mike Place
cf16d82ba2 Merge pull request #36602 from alexbleotu/get_datacenter-gh 
Get datacenter gh
 2016-09-28 11:47:00 +09: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