Erik Johnson
613f0611f8
Lint
2018-08-14 13:53:31 -05:00
Erik Johnson
81f272f91a
Rename outputter tests to match naming convention
2018-08-14 13:53:31 -05:00
Erik Johnson
fba03360f4
Rename venafi test module to bring it closer to the naming convention
2018-08-14 13:53:30 -05:00
Erik Johnson
9c145009da
Rename exec module integration test files to respect naming convention
2018-08-14 13:53:30 -05:00
Erik Johnson
91fa09ec79
Rename providers to clouds to respect naming convention
...
Also, move rackspace openstack-based tests to test_openstack.py
2018-08-14 13:53:30 -05:00
Erik Johnson
d56dcdd608
Rename "providers" dir to "clouds" to respect naming convention
2018-08-14 13:53:30 -05:00
Erik Johnson
f1b7d54fdd
Rename virtualenv state test module to respect naming convention
2018-08-14 13:53:30 -05:00
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
Nicole Thomas
b412bff534
Merge pull request #49110 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-14 13:11:24 -04:00
Mike Place
e78fc0e0eb
Merge pull request #48901 from garethgreenaway/48665_auth_ldap_valid_token_failed_auth
...
[2018.3] fix to auth/ldap.py
2018-08-14 18:10:18 +02: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
d46e23f4c2
Merge pull request #49109 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-14 09:10:46 -04:00
rallytime
3c5527f300
Merge branch '2017.7.8' into '2017.7'
...
No conflicts.
2018-08-14 09:09:42 -04:00
Nicole Thomas
484c1e0123
Merge pull request #49099 from rallytime/bp-49085
...
Back-port #49085 to 2018.3
2018-08-14 08:42:50 -04:00
Daniel Wozniak
8954dd269f
Merge pull request #49090 from dwoz/file_line_fix
...
Search for (but do not include) CRLF line ending
2018-08-13 15:00:33 -07:00
Daniel Wozniak
b99edc3dce
Merge pull request #49088 from dwoz/file_hash_diffs
...
Multiple file state test fixes
2018-08-13 14:59:28 -07:00
Daniel Wozniak
274977b6c4
Merge pull request #49087 from dwoz/url_file_test_fixes
...
Filter out scheme's that are not valid
2018-08-13 14:58:58 -07:00
Daniel Wallace
024d9cb843
fix async call to process manager
2018-08-13 16:51:21 -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
Nicole Thomas
6942ef1102
Merge pull request #49096 from rallytime/new-doc-img-2018.3
...
Update the DOCBANNER image for saltconf
2018-08-13 15:59:38 -04:00
rallytime
75080705ce
Update the DOCBANNER image for saltconf
2018-08-13 15:56:44 -04:00
Daniel A. Wozniak
0dca634e3c
Search for (but do not include) CRLF line ending
...
When searching for a line in a file that has CRLF line endings, the
normal $ regex will not match a line. With this change, we will match on
but not include LF, CRLF, and the end of a file.
2018-08-13 12:35:01 -07: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
Nicole Thomas
db5fb3232a
Merge pull request #49086 from rallytime/new-doc-img
...
Update the DOCBANNER image for saltconf
2018-08-13 15:11:50 -04:00
