valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,725 Commits 24 Branches 182 Tags 341 MiB
e041b8f486
Commit Graph

3081 Commits

Author SHA1 Message Date
Alexandru Bleotu
e041b8f486 Added tests for get_details in modules.esxdatacenter 2017-07-19 15:24:10 +01:00
Alexandru Bleotu
6814e8405d Added tests for supporting esxdatacenter proxy in modules.vsphere 2017-07-19 15:24:10 +01:00
Mike Place
e0c4a4bb1b Merge pull request #42192 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-07 13:59:30 -05:00
rallytime
bf45c18f9d Convert remaining "assert_called_once" references to new syntax 
These tests are new to develop and need to be converted to use the new
assert_called_once syntax introduced in #42084.
 2017-07-07 10:28:19 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -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
Jay
623ca64121 Merge branch 'develop' into patch-4 2017-07-06 16:58:53 -04:00
Nicole Thomas
c87d1edd0c Merge branch 'develop' into haproxyconn-tests 2017-07-06 10:22:33 -06:00
Jay
11777e7641 Merge pull request #1 from saltstack/develop 
Update branch to latest
 2017-07-05 11:16:25 -04:00
Jay
0d7cadb1f2 Update test_win_service.py 
Added StartTypeDelayed to mock_info return for test_enable.
 2017-07-03 18:59:29 -04:00
rallytime
291515e445 [PY3] Fix haproxyconn unit tests that are failing 
``assertItemsEqual`` does not exist in Python 3. It was removed. Since
``assertItemsEqual(a, b)`` is the same thing as asserting that
``sorted(a) == sorted(b)``, we can just update the test in this manner
to work in both Python 2 and 3.
 2017-07-03 16:25:57 -06: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
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06: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
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
rallytime
9227a1263d Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-30 10:00:01 -06:00
twangboy
bf20938f11 Fixes problem with path 2017-06-28 15:02:12 -06:00
rallytime
3c823109a1 Lint: Remove extra blank line 2017-06-28 13:29:31 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
twangboy
3eca45e000 Fix unit tests for ssh 2017-06-27 15:29:44 -06:00
Mike Place
41c65b0e2c
Gate assert check behind mock ver 2017-06-26 11:04:49 -06:00
Mike Place
eb2bf865b8
Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7 2017-06-23 10:51:04 -06:00
Erik Johnson
61870075aa Add building_highstate odict to mock HighState class 2017-06-23 11:48:00 -05:00
Mike Place
00746cafce
Lint fix for win_certutil 2017-06-23 10:11:48 -06:00
Mike Place
8647086de8
Merge branch '2016_11_to_7' of github.com:cachedout/salt into 2016_11_to_7 2017-06-22 15:39:38 -06:00
Erik Johnson
2ee43fc743 Fix default opts handling 
Starting in 2017.7 the dunder dicts are handled differently in unit
tests.
 2017-06-22 13:40:40 -05:00
Mike Place
80cb57e02b
Fix win_certutil merge error 2017-06-22 11:40:56 -06:00
Mike Place
481797b147
Merge branch '2016.11' into '2017.7' 2017-06-21 15:49:39 -06:00
Mike Place
6e9e0714f0
Merge forward from 2016.11 to 2017 2017-06-21 14:51:02 -06:00
Mike Place
a25818b90b Merge pull request #41872 from DSRCorporation/bugs/py3_DiskTestCase 
Py3: test_disk fix: don't expect dict iteration order will be the same
 2017-06-21 12:09:57 -05:00
Mike Place
eea9cafba0 Merge pull request #41874 from DSRCorporation/bugs/py3_mdadm_test 
Py3 mdadm test
 2017-06-21 12:03:33 -05:00
Mike Place
13df29ed9b Merge pull request #41877 from Ch3LL/fix_netstat_test 
Fix netstat and routes test
 2017-06-21 11:16:58 -05:00
Mike Place
66f8c83c93 Merge pull request #41566 from morganwillcock/certutil 
win_certutil: workaround for reading serial numbers with non-English languages
 2017-06-21 10:40:28 -05:00
Mike Place
4d0f5c433d Merge pull request #41679 from terminalmage/get-top-file-envs 
Prevent unnecessary duplicate pillar compilation
 2017-06-21 10:32:42 -05:00
Dmitry Kuzmenko
e1e8d96ef2 Removed unneeded import. 2017-06-21 18:08:44 +03:00
Ch3LL
d2076a6c93 Patch salt.utils.which for test_route test 2017-06-21 10:55:01 -04:00
Ch3LL
51f7e107dc Patch salt.utils.which for test_netstat test 2017-06-21 10:50:03 -04:00
Erik Johnson
a916e8da49 Improve normalization of saltenv/pillarenv usage for states 2017-06-21 08:49:34 -05:00
Erik Johnson
02f293a19c Update state unit tests to reflect recent changes 2017-06-21 08:19:05 -05:00
Dmitry Kuzmenko
1401b2d5ba Py3: mdadm test fix: don't expect kwargs iteration order 2017-06-21 15:45:55 +03:00
Dmitry Kuzmenko
127e48025a Py3: tests_disk fix: don't expect dict iteration order will be the same 2017-06-21 14:48:59 +03:00
Morgan Willcock
c337d52d0c Fix test data for test_get_serial, and a typo 2017-06-21 00:26:47 +01:00
Morgan Willcock
7f6961378e test and lint fixes 2017-06-20 22:30:11 +01:00
Mike Place
4f8714037d Merge pull request #41851 from DSRCorporation/bugs/py3_tests_nitrogen 
Minor Py3 related tests fixes.
 2017-06-20 15:11:43 -05:00
Mike Place
f04888d88f Remove unused import 2017-06-20 12:15:50 -06:00
Mike Place
594b7631f7 Merge pull request #41850 from DSRCorporation/bugs/py3_tests_2017.7 
Py3 tests fix for 2017.7
 2017-06-20 12:17:28 -05:00
Dmitry Kuzmenko
ea656e92c6 Py3: Disabled augeas test that segfaults the test suite. 
Because of a bug in python-augeas:
https://github.com/hercules-team/python-augeas/issues/30
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
5a1bdd368e Py3: minor tests updates 
Correct skipping explanation and correctly disable by proper conditions.
BTW, mysql works on Py3. There's a port of python-mysql and test passes.
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
2cff18e2ef Py3: fix boto elb test 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
9de940d3d3 Py3: don't use mock.assert_called_once implemented in 3.6. 2017-06-20 16:34:22 +03:00