rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/loader.py
- salt/modules/dockermod.py
- salt/modules/sensehat.py
- salt/utils/parsers.py
- tests/integration/cloud/providers/test_ec2.py
- tests/integration/modules/test_cp.py
- tests/integration/modules/test_groupadd.py
- tests/integration/spm/test_man_spm.py
- tests/integration/states/test_npm.py
- tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Daniel A. Wozniak
d39f4852d8
Handle non-zero status exception
2018-03-29 14:39:40 -07:00
Daniel A. Wozniak
83c005802b
Handle cases where git can not be found
...
Signed-off-by: Daniel A. Wozniak <dwozniak@saltstack.com>
2018-03-29 14:39:29 -07:00
Daniel A Wozniak
628b87d5c4
Skip test when git symlinks are not configured
2018-03-22 23:30:15 -07:00
rallytime
9effd08bb3
Add unicode_literals to modules, states, tests (I)
2018-01-21 09:27:14 -05:00
twangboy
b401340e6c
Fix unit.modules.test_inspect_collector on Windows
...
Uses os.sep instead of unix-style paths in the test
Uses salt.utils.path.islink() to detect symlinks instead of
os.path.islink(). os.path.islink() does not correctly detect symlinks in
Windows
Put grp and pwd imports inside a try/except block
2017-08-29 15:59:08 -06:00
Michael Calmer
f7cd2f6722
Fix os_family case in unittest
2017-06-16 14:39:08 +02:00
Pedro Algarvio
abe608d739
Drop @patch usage
2017-04-28 13:36:42 +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
