valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,004 Commits 24 Branches 182 Tags 341 MiB
b49d8df210
Commit Graph

8184 Commits

Author SHA1 Message Date
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
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
rallytime
83a15cb623
Add optimization_order config to mocked opts 2018-08-13 12:06:48 -04: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
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
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
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
rallytime
a43d9b4ba6
Mark a jinja template test as flaky 
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
 2018-08-09 15:51:34 -04:00
Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems 
Support for execution modules and states mount on AIX
 2018-08-09 13:51:54 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo 
Fix pkg.install when pkg already installed
 2018-08-09 13:45:50 -04:00
Erik Johnson
d6e5038022
Fix file.get_diff for remote files 
Once the files were cached, the function was still trying to open the
paths passed into it, not the cached paths. This fixes that and adds
additional unit tests.
 2018-08-09 10:56:05 -05:00
Travis Paul
d59b6d8269
Add unit test for NetBSD 8 ifconfig changes 
lint changes in salt/utils/network.py
 2018-08-09 21:26:08 +08:00
David Murphy
92818f816b Fixes for testing 2018-08-08 12:15:59 -06:00
David Murphy
77dd7a1743 Adjust unit tests 2018-08-08 12:15:59 -06:00
David Murphy
9fb5641dc7 Mount unit tests for modules and states for AIX 2018-08-08 12:15:59 -06:00
David Murphy
b28f427432 Save off work after laptop issue 2018-08-08 12:15:59 -06:00
Erik Johnson
0441cd56ef
Add optimization_order to mocking 2018-08-08 11:22:52 -05:00
Erik Johnson
a78663a301
Lint 2018-08-08 11:22:52 -05:00
Erik Johnson
764969ce08
Add a test to confirm that .py files are still loaded correctly 
Also, use USE_IMPORTLIB to gate testing on optimization_order, since
this only works with Python 3.5+.
 2018-08-08 11:22:52 -05:00
Erik Johnson
e7c10196da
Quiet the byte compiling for PY2 2018-08-08 11:22:52 -05:00
Erik Johnson
9338370477
Add unit tests for loader optimization levels 2018-08-08 11:22:52 -05:00
rallytime
9f0b9a1073
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:44:38 -04:00
rallytime
1a23bb233f
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 10:42:57 -04:00
rallytime
d0136b1be5
Update expected return value in boto test 
The expected return from moto has changed from `-1` to `None` in the
latest version of moto (1.3.4). This PR updates the test to be in line
with the return from moto.
 2018-08-08 09:16:55 -04:00
Nicole Thomas
ab1a713bc3
Merge pull request #48934 from terminalmage/issue48777 
Properly handle latin-1 encoding in file diffs
 2018-08-07 17:02:23 -04:00
twangboy
47b2898a85
return empty dict on no changes 2018-08-07 12:25:15 -06:00
Erik Johnson
52c64e4d51
Fix to_unicode test 
Since latin-1 is not being automatically decoded, we need to explicitly
pass it on the test.
 2018-08-07 09:57:21 -05:00
twangboy
6532706d2f
Make the tests run on Linux 2018-08-06 17:55:46 -06:00
twangboy
cfe55a391a
Add tests for pkg.install output 2018-08-06 17:53:37 -06:00
Erik Johnson
d39fa889f3
Add stringutils.get_diff to mocks 2018-08-06 15:27:13 -05:00
Erik Johnson
f14f4dae22
Add unit test for latin-1 fallback, multi-encoding 2018-08-03 18:38:08 -05:00
Nicole Thomas
0272cadff8
Merge branch '2018.3' into unit_state 2018-08-03 16:30:28 -04:00
Ch3LL
b82dd708be
skip getpwnam check on mac in unit test_cmdmod 2018-08-02 16:39:49 -04:00
Ch3LL
5896c7fc36
remove base_top_file file in teardown and add sleep 2018-08-02 16:05:41 -04:00
Gareth J. Greenaway
0791b0a03c
FileGrepTestCase tests back to 2018.3 2018-07-31 09:33:58 -07:00
Gareth J. Greenaway
2e01c55e7e
Fixing a bug that prevents specifying wildcards for filenames. 2018-07-31 09:33:58 -07:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix 
Always transfer bytes from fileserver roots
 2018-07-30 15:37:12 -07:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings 2018-07-30 11:41:58 -07:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test 
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
 2018-07-27 09:16:59 -05:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-26 14:14:33 -04:00
Daniel A Wozniak
a89019e956
Multiple windows test fixes 2018-07-24 23:09:14 -07:00
rallytime
4122da40b5
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/netapi/rest_tornado/test_app.py
  - tests/integration/states/test_service.py
 2018-07-24 14:28:33 -04:00
Nicole Thomas
062fe7cccf
Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes 
[2018.3] beacon diskusage fixes
 2018-07-24 13:45:25 -04:00
Nicole Thomas
e873621009
Merge pull request #48711 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-24 13:38:57 -04:00