 rallytime
|
201031fa8a
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
0441cd56ef
Add optimization_order to mocking
|
vor 6 Jahren |
|
rallytime
|
3273bbdab7
Merge branch '2017.7' into '2018.3'
|
vor 6 Jahren |
|
Erik Johnson
|
93ee5ee2b0
Fix all Sphinx warnings
|
vor 6 Jahren |
|
Erik Johnson
|
d6d7da5c90
Replace all usage of six.b
|
vor 6 Jahren |
|
Erik Johnson
|
002aa88a97
Replace yaml usage with a helper to ensure unicode is handled properly
|
vor 7 Jahren |
|
Erik Johnson
|
3184168365
Use explicit unicode strings + break up salt.utils
|
vor 7 Jahren |
|
rallytime
|
ccf790a83f
Update all references for moved functions to use "files" util
|
vor 7 Jahren |
|
Mike Place
|
8bb86813d1
Remove unnecessary pass statement
|
vor 7 Jahren |
|
Dmitry Kuzmenko
|
67e0c3e166
Terminate gpg-agent after each test.
|
vor 7 Jahren |
|
rallytime
|
8ee4bbb8eb
Add "conf_file" to ADDITIONAL_OPTS for pillar integration tests
|
vor 7 Jahren |
|
Pedro Algarvio
|
2ee6d5d589
Import from the original modules not `tests.integration`
|
vor 7 Jahren |
|
Pedro Algarvio
|
d05028e88c
These are not integration tests
|
vor 7 Jahren |
|
Pedro Algarvio
|
40a64191a1
Absolute imports and A LOT of code cleanup.
|
vor 7 Jahren |
|
Pedro Algarvio
|
3beb3fb801
Move whatever we need from salttesting to salt.
|
vor 7 Jahren |
|
Pedro Algarvio
|
15af4c9728
Test filenames conformity. Adjust for pytest.
|
vor 7 Jahren |
