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
82,494 Commits 24 Branches 182 Tags 341 MiB
7aa31ff030
Commit Graph

10163 Commits

Author SHA1 Message Date
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06:00
Erik Johnson
14cf6ce322 is_windows is a function, not a propery/attribute 
While not fatal, this could potentially cause problems running this
test on Windows.
 2017-07-17 23:36:21 -05:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Mike Place
acd29f9b38 Merge pull request #42206 from rallytime/fix-flaky-test 
[PY3] Fix test that is flaky in Python 3
 2017-07-17 12:09:52 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
twangboy
ed89cd0b93 Use os.sep for path seps 2017-07-12 10:13:26 -06:00
rallytime
78cdee51d5 Gate boto_elb tests if proper version of moto isn't installed 
For Python 2 tests, we can use an older version. But when running
these tests of Python 3, we need a newer version of moto that supports
Python 3.

This gates the tests if the expected version of moto is missing.
 2017-07-11 17:00:50 -06:00
twangboy
55b278c478 Mock the reg.read_value function 2017-07-11 13:23:11 -06:00
twangboy
45be32666a Add error-handling function to shutil.rmtree 2017-07-11 13:08:00 -06:00
rallytime
2be4865f48 [PY3] Fix test that is flaky in Python 3 
We can't rely on lists having the same order in Python3 the same
way we rely on them in Python2. If we sort them first, and then
compare them, this test will be more reliable.
 2017-07-07 09:43:52 -06:00
garethgreenaway
47ade9e91c Merge pull request #42088 from terminalmage/update-mocking 
Update mocking in network tests
 2017-07-06 15:03:42 -07:00
Gareth J. Greenaway
a34970b45b Back porting the fix for 2017.7 that ensures the order of the names parameter. 2017-07-06 12:12:50 -07:00
Erik Johnson
d15f7ded82 Add integration test for 42116 2017-07-05 11:07:38 -05:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Erik Johnson
9a268949e3 Add integration test for 42116 2017-07-05 00:48:50 -05:00
Erik Johnson
fc27c1a948 Update mocking in network tests 
017fbdb changed the function calls in such a way that tests in 2017.7
now fail. This updates the mocking to account for new code paths
introduced in this commit.
 2017-07-03 10:43:34 -05:00
Erik Johnson
d942752e95 Fix usage of assert_called_once in Python 3 < 3.6 
This is a more complete fix which builds upon 41c65b0 and covers all
refs to assert_called_once in the suite.
 2017-07-03 09:30:12 -05:00
Mike Place
5b2ae2dd04 Merge pull request #42062 from terminalmage/arch-grains-test 
Add debug logging for grains tests
 2017-06-30 16:58:15 -05:00
Erik Johnson
3071bb7a37 Add debug logging for grains tests 
The assert doesn't tell us anything about the grain that is failing.
This adds some debug logging to make this easier to troubleshoot.
 2017-06-30 15:39:48 -05:00
rallytime
f0416acc37 Add mode back in for tmp file creation on Linux 
The mode arg was removed in PR #41966 to get this test to pass on
Windows. However, this caused the same test to fail on Arch Linux
when running Python 3.

Let's keep the test the way it was for non-windows boxes, and only
remove the mode for windows.
 2017-06-30 12:06:54 -06:00
Nicole Thomas
951ed4a9c9 Merge pull request #42032 from terminalmage/py3-tests 
Avoid race condition when iterating through processes
 2017-06-30 08:29:54 -06:00
Mike Place
32b73efd2d Merge pull request #42034 from rallytime/fix-41971 
Add the 'provider' key to salt.cloud.CloudClient.create()
 2017-06-30 09:01:19 -05:00
rallytime
a77e1bd9dd Add integration test for salt.cloud.CloudClient.create() function 2017-06-29 14:37:12 -06:00
Erik Johnson
d31939574b Avoid race condition when iterating through processes 
If a process has already exited between when psutil.process_iter() was
invoked, and when we invoke the cmdline() func, it will raise an
exception. This commit catches this exception and skips these processes.
 2017-06-29 15:08:17 -05:00
Erik Johnson
26f848e111 Mock socket.getaddrinfo in unit.utils.network_test.NetworkTestCase.test_host_to_ips 
This will keep future IP address changes from impacting this test. It
also tests a host which returns an IPv6 address, and a host which cannot
be resolved.
 2017-06-29 14:49:39 -05:00
twangboy
cdb53c2657 Set file_roots for Windows Temp 2017-06-29 13:01:10 -06:00
Mike Place
1b194904f3 Merge pull request #41992 from twangboy/win_unit_test_archive 
Fix `unit.modules.test_archive` on Windows
 2017-06-29 11:53:04 -05:00
Mike Place
9f3438d5e7 Merge pull request #42000 from terminalmage/merge-2017.7 
Merge 2016.11 into 2017.7 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7
 2017-06-28 21:44:22 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
 2017-06-28 20:27:32 -05:00
Erik Johnson
94316114ee Add test for pyobjects priority 2017-06-28 19:48:46 -05:00
Erik Johnson
dfd0e51794 Update test_map to test declarative ordering 2017-06-28 19:48:46 -05:00
Erik Johnson
91576a7263 Introduce "priority" feature for pyobjects 
When there are multiple matches (such as when both an os_family and os
grain both match the minion), the order in which they are processed is
determined by the iteration order of the class' __dict__ attribute.
Since this would be different in different versions of Python, behavior
would be inconsistent depending on which version of Python is being used.

This adds a priority attribute to the Map subclass which, if present,
will re-order the match groups such that the results will be predictable
irrespective of Python version.
 2017-06-28 19:48:46 -05:00
Erik Johnson
fb6a93314f Update IP address for unit.utils.network_test.NetworkTestCase.test_host_to_ips 
The IP for saltstack.com changed, so this test needs to be updated.
 2017-06-28 19:42:52 -05:00
twangboy
bf20938f11 Fixes problem with path 2017-06-28 15:02:12 -06:00
rallytime
9cb9547bc0 Rename transport_test file to test_transport and update imports for pytest 2017-06-28 11:35:13 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
garethgreenaway
4fe273f78e Merge pull request #41969 from twangboy/win_unit_test_config 
Fix `unit.config.test_config` for Windows
 2017-06-28 08:18:07 -07:00
garethgreenaway
7c96200e42 Merge pull request #41967 from twangboy/win_unit_test_api 
Fix `unit.config.test_api` for Windows
 2017-06-28 08:17:21 -07:00
twangboy
98bc208db9 Fix paths, skip impossible 2017-06-27 17:31:23 -06:00
twangboy
1f497d8f78 Fix paths 2017-06-27 16:43:54 -06:00
twangboy
3eca45e000 Fix unit tests for ssh 2017-06-27 15:29:44 -06:00
Mike Place
4209be843d Merge pull request #41959 from DSRCorporation/bugs/minor_dict_diff_enhance 
Minor dict diff enhance in tests.
 2017-06-27 15:18:16 -05:00
Mike Place
f9965ccfcb Merge pull request #41939 from cachedout/mdadm_py3_test 
Gate assert check behind mock ver
 2017-06-27 13:04:23 -05:00
Mike Place
e3bfd5a593 Merge pull request #41952 from meaksh/2017.7-suse-leftovers-part-two 
Fix "zypp_plugins" unit test for Python 3
 2017-06-27 12:42:00 -05:00
Dmitry Kuzmenko
e01e566779 Minor: show full dict diffs if test fails. 2017-06-27 16:22:09 +03:00
Pablo Suárez Hernández
7affbce83a Fix zypp_plugins unit test for Python 3 2017-06-27 09:26:35 +01:00
Mike Place
1c74b8909e Merge pull request #41942 from terminalmage/add-maxdiff 
Add maxDiff to pyobjects test for troubleshooting
 2017-06-26 13:01:30 -05:00