Commit Graph

13557 Commits

Author SHA1 Message Date
Erik Johnson
c1f94dbf1b
Split ssh state tests into separate modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
9c8ba4a633
Split mysql database tests into two modules to respect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
d51748eea2
Rename some files to avoid them being identified as test modules 2018-08-14 13:53:30 -05:00
Erik Johnson
1fccbf764a
Rename acl unit test module to confirm to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
160223dc80
Consolidate/move fileclient/fileserver tests to conform to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
1aacf77b3e
Rename/consolidate salt.utils unit tests to conform to naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
5a0990b087
Rename pillar unit test modules to reflect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
516594b164
Consolidate netapi tests and move them to reflect naming convention 2018-08-14 13:53:30 -05:00
Erik Johnson
8f5fef55d4
Consolitdate and move salt-ssh unit tests to proper location 2018-08-14 13:53:30 -05:00
Erik Johnson
9801ce3271
Consolidate and move loader tests to test/unit/test_loader.py 2018-08-14 13:53:29 -05:00
Erik Johnson
f72bbc5036
Rename beacon unit test modules to conform with naming convention
Also consolidate pyroute2 network_settings tests into network_settings
beacon test module.
2018-08-14 13:53:29 -05:00
Erik Johnson
fa76cb6ada
Move inspectlib tests to conform with naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
81e38239fe
Move shared kernelpkg test cases to tests/support/ 2018-08-14 13:53:29 -05:00
Erik Johnson
e0d95b640f
Consolidate misplaced tests into tests/unit/test_config.py 2018-08-14 13:53:29 -05:00
Erik Johnson
3a1ec12613
Rename slack engine test file to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
c9c9d20f19
Rename test_map_conf test file to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
5c936c016d
Rename the aptpkg state module to respect naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
ac50eb84e1
Remove redundant "test" from filename 2018-08-14 13:53:29 -05:00
Erik Johnson
b03a56355b
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-08-14 13:53:29 -05:00
Erik Johnson
b49d8df210
Fix bad copypasta in docstring 2018-08-14 13:53:29 -05:00
Erik Johnson
069102b82d
Rename sentry returner test to match naming convention 2018-08-14 13:53:29 -05:00
Erik Johnson
23980830d1
Use tests.support.paths instead of deprecated integration module 2018-08-14 13:53:29 -05:00
Erik Johnson
ffb842d055
Move salt.utils.context tests to their proper location 2018-08-14 13:53:28 -05:00
Erik Johnson
d69069be13
Move context cache tests to their proper location 2018-08-14 13:53:28 -05:00
rallytime
4649f60209
Update old utils paths with new paths 2018-08-14 09:52:40 -04:00
rallytime
49c2a784bb
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/file.py
  - salt/modules/reg.py
  - salt/states/reg.py
  - tests/integration/states/test_file.py
2018-08-14 09:48:13 -04:00
Nicole Thomas
bc033da677
Merge pull request #49071 from rallytime/bp-49034
Back-port #49034 to 2018.3
2018-08-13 16:15:30 -04:00
Nicole Thomas
90c2f026b3
Merge pull request #49077 from rallytime/bp-49075
Back-port #49075 to 2018.3
2018-08-13 15:59:59 -04:00
Daniel A. Wozniak
054afb8197
Multiple file state test fixes
- Account for hash differences due to line endings
- Ignore tests that are not valid on windows
- Other test fixes due to line endings
2018-08-13 12:29:25 -07:00
Nicole Thomas
0e1ed7b923
Merge pull request #49055 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-13 15:20:10 -04:00
Daniel Wallace
5e07b8306b
fix last async issue 2018-08-13 12:25:49 -04:00
rallytime
83a15cb623
Add optimization_order config to mocked opts 2018-08-13 12:06:48 -04:00
Gareth J. Greenaway
8108a4d31a
Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly. 2018-08-13 10:47:47 -04:00
Nicole Thomas
b0d5acbe0d
Merge pull request #49052 from isbm/isbm-python37-support-2018.3
Python 3.7 support (backport 2018.3)
2018-08-13 09:06:50 -04:00
Nicole Thomas
338ecb70ef
Merge pull request #49026 from dwoz/issue_48557
Fix file.line line endings
2018-08-13 09:05:41 -04:00
Daniel Wallace
4386a9ca1f
Merge branch '2018.3' into isbm-python37-support-2018.3 2018-08-10 15:47:12 -05:00
rallytime
ea6883ee55
Update old utils paths to new utils paths 2018-08-10 13:15:53 -04:00
rallytime
201031fa8a
Merge branch '2017.7' into '2018.3'
Conflicts:
  - 	doc/man/salt.7
  - 	doc/ref/configuration/minion.rst
  - 	salt/cloud/clouds/ec2.py
  - 	salt/returners/highstate_return.py
  - 	tests/support/gitfs.py
  - 	tests/unit/loader/test_loader.py
2018-08-10 13:12:14 -04:00
Daniel Wallace
6bc44c91c4
remove localhost from tests
now that enable_ssh_minions is turned off, remove localhost from
returns.
2018-08-10 09:03:35 -05:00
Daniel Wallace
7b168a5aac
disable enable_ssh_minions to see if it is slowing down 2018.3 tests 2018-08-10 09:03:35 -05:00
Bo Maryniuk
47078a300f Remove async keyword, moving it into the kwargs. 2018-08-10 15:59:24 +02:00
Bo Maryniuk
31dccc4fdf fix unicode literals 2018-08-10 15:59:24 +02:00
Bo Maryniuk
35eaebb8a4 Fix docstrings 2018-08-10 15:59:23 +02:00
Bo Maryniuk
b7da571624 Fix imports 2018-08-10 15:52:01 +02:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-10 09:08:47 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
4eeb75f028
Merge pull request #49033 from terminalmage/issue48996
Fix file.get_diff for remote files
2018-08-09 17:06:52 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test
Mark a jinja template test as flaky
2018-08-09 17:05:53 -04:00
Nicole Thomas
b24c96a292
Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig
Handle ifconfig output differently for NetBSD >= 8.0
2018-08-09 16:07:43 -04:00