Pedro Algarvio
b2b0764dd4
Be aware of the different path separators
2019-05-08 13:16:38 +01:00
Gareth J. Greenaway
4908ed3048
Merge branch '2017.7' into merge-2018.3
2019-03-25 13:28:15 -07:00
Pedro Algarvio
cc6fb4662a
Additionally ignore files in nox virtualenvs and CI artifacts directories
2019-03-21 11:32:39 +00:00
Erik Johnson
23980830d1
Use tests.support.paths instead of deprecated integration module
2018-08-14 13:53:29 -05:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- requirements/base.txt
- salt/states/archive.py
- salt/states/file.py
- tests/integration/runners/test_state.py
- tests/unit/daemons/test_masterapi.py
2018-06-11 11:45:37 -04:00
Daniel Wallace
8d15b93d00
remove tox virtualenvs from doc tests
2018-06-06 12:22:22 -05:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
twangboy
0a9e862bf4
Use regex to split
2017-11-09 16:24:19 -07:00
rallytime
26410c662f
Update some salt.utils.x paths for moved util functions
...
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
2017-08-29 16:24:47 -04:00
twangboy
201ceae4c4
Fix lint, remove debug statement
2017-08-16 10:29:26 -06:00
twangboy
37029c1a16
Fix unit.test_doc test
...
Use findstr instead of grep on Windows
Use os.linesep for file paths
2017-08-15 15:30:13 -06: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
4ff190cac6
Fix, simplify, syntax the test_doc unit test
2017-02-23 23:19:45 +00:00
Pedro Algarvio
15af4c9728
Test filenames conformity. Adjust for pytest.
2017-02-23 23:19:42 +00:00
