Gareth J. Greenaway
|
b3c1be27fb
|
Tier two unicode updates for modules, states and related tests.
|
2018-01-25 11:59:25 -08:00 |
|
rallytime
|
052b13c98e
|
Merge branch '2017.7' into 'develop'
Conflicts:
- salt/cli/daemons.py
- salt/client/ssh/__init__.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/proxy/fx2.py
- salt/utils/__init__.py
- salt/utils/jinja.py
- salt/utils/napalm.py
- salt/utils/path.py
- salt/utils/verify.py
- tests/integration/modules/test_saltutil.py
- tests/integration/states/test_service.py
- tests/unit/utils/test_verify.py
|
2017-11-22 12:36:03 -05:00 |
|
twangboy
|
6c872e95e6
|
Add back the setup_loader_modules function
Use empty dict instead of defining wmi
|
2017-11-10 11:30:00 -07:00 |
|
Erik Johnson
|
20273e3697
|
No need for setup_loader_modules since we're actually importing wmi
|
2017-11-10 11:29:59 -07:00 |
|
twangboy
|
8c107873cd
|
Remove wmi monkeypatching
The WMI object was being monkey patched in the global namespace causing
other tests to fail
|
2017-11-10 11:29:54 -07:00 |
|
Erik Johnson
|
877abb89d0
|
Complete the salt.utils refactor
This moves the remaining 30 functions from salt.utils to new locations.
|
2017-10-15 09:43:31 -05:00 |
|
rallytime
|
ef0df4a954
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- salt/modules/win_network.py
- salt/modules/win_pkg.py
- salt/utils/gitfs.py
- tests/unit/modules/test_win_network.py
- tests/unit/states/test_file.py
|
2017-05-09 14:32:49 -06:00 |
|
Pedro Algarvio
|
abe608d739
|
Drop @patch usage
|
2017-04-28 13:36:42 +01:00 |
|
Pedro Algarvio
|
99bc71dc4e
|
Proper mocking.
|
2017-03-28 19:04:01 +01:00 |
|
Pedro Algarvio
|
9b1e55aa85
|
Import the full module namespace to avoid import shadowing.
https://github.com/saltstack/salt/pull/39996#issuecomment-287857698
|
2017-03-28 19:02:47 +01:00 |
|
Pedro Algarvio
|
40a64191a1
|
Absolute imports and A LOT of code cleanup.
|
2017-03-01 01:33:07 +00:00 |
|
Pedro Algarvio
|
3beb3fb801
|
Move whatever we need from salttesting to salt.
Let's drop the salttesting dependency cycle.
|
2017-02-28 22:52:49 +00:00 |
|
Pedro Algarvio
|
15af4c9728
|
Test filenames conformity. Adjust for pytest.
|
2017-02-23 23:19:42 +00:00 |
|