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 |
|
rallytime
|
1a40e105e5
|
Merge branch '2016.11' into 'nitrogen'
Conflicts:
- tests/integration/__init__.py
- tests/integration/modules/test_state.py
|
2017-06-06 12:57:44 -06:00 |
|
Nicole Thomas
|
4d7871e4d7
|
Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
|
2017-04-05 14:15:05 -06:00 |
|
rallytime
|
71f3c73150
|
Merge branch '2016.11' into 'develop'
Conflicts:
- salt/template.py
- salt/utils/pycrypto.py
- tests/integration/modules/test_state.py
- tests/unit/states/test_artifactory.py
- tests/unit/test_template.py
|
2017-04-05 13:02:14 -06:00 |
|
Pedro Algarvio
|
61003bca0a
|
Take care of resource leakage on tests
|
2017-04-04 18:58:20 +01:00 |
|
Pedro Algarvio
|
2ee6d5d589
|
Import from the original modules not tests.integration
|
2017-04-04 18:58:19 +01:00 |
|
Pedro Algarvio
|
785698d2ce
|
Import for the original module
|
2017-04-04 18:04:38 +01:00 |
|
Pedro Algarvio
|
b94992f544
|
Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes
|
2017-04-04 18:04:38 +01:00 |
|
Pedro Algarvio
|
8031ac0209
|
Move mixins to tests.support.mixins.
The adapted config mixin get config methods are not static methods
|
2017-04-04 17:29:34 +01:00 |
|
Pedro Algarvio
|
fd6d031804
|
We now sync all on minion connect
|
2017-04-01 14:22:56 +01:00 |
|
Ch3LL
|
aae2a30eda
|
add require_in for an entire sls test
|
2017-03-27 12:47:36 -06:00 |
|
Pedro Algarvio
|
c436d9f2f6
|
This no longer applies.
|
2017-03-08 18:34:31 +00: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 |
|