Gareth J. Greenaway
b3c1be27fb
Tier two unicode updates for modules, states and related tests.
2018-01-25 11:59:25 -08:00
rallytime
984fa35062
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/key.py
- salt/modules/mount.py
- salt/modules/system.py
- tests/unit/modules/test_mount.py
- tests/unit/modules/test_pam.py
- tests/unit/modules/test_parted.py
2017-09-11 12:55:39 -04:00
twangboy
6ceb895a84
Use os.path.join for paths
2017-09-07 16:51:10 -06:00
rallytime
ccf790a83f
Update all references for moved functions to use "files" util
...
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
2017-07-18 10:31:01 -06:00
Dmitry Kuzmenko
6b0921e5ba
Py3 tests fixes: don't mock non-callable objects with return_value.
...
mock = MagicMock(return_value='') works for functions: here mock() will
return the value (empty string). But mock returns the MagicMock object.
Not sure why but it worked in Py2, but in Py3 os.path.join(mock,
'something'), for instance, returns an error.
Fixed the issues by avoiding of using mocks where we can use simple
strings.
2017-05-25 12:33:43 +03:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests
2017-04-04 18:58:20 +01:00
Pedro Algarvio
d397763553
Adjust to the new LoaderModuleMockMixin usage
2017-03-28 19:03:59 +01:00
Pedro Algarvio
5c13f7b2bb
Proper mocking.
2017-03-28 19:02:50 +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
