Daniel A. Wozniak
444da3f893
Fix py3 wart (chr vs bytesstring)
2018-04-14 17:39:29 -07:00
Daniel A Wozniak
e8acca01c2
Fix failing state test by normalizing line endings
...
Fixes:
integration.modules.test_state.StateModuleTest.test_issue_1896_file_append_source
2018-04-14 15:45:11 -07:00
Gareth J. Greenaway
13875e78cf
Fixing documention string for test.
2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
3d288c44d4
Fixing test documentation
2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
6cff02ef6a
Adding tests for #46788
2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
152c43c843
Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran.
2018-03-15 17:45:42 -07:00
Daniel Wallace
d6d9e36359
add tests for names and listen/listen_in
...
Closes #30115
2018-03-05 12:15:23 -07:00
Gareth J. Greenaway
359265869f
Adding a couple tests to ensure that duration is included in state run results even when states do not run.
2018-01-26 12:06:29 -08:00
Nicole Thomas
2340f0b487
Merge pull request #45380 from twangboy/backport_45308
...
Backport changes from #45308
2018-01-11 14:45:20 -05:00
twangboy
419be8a9b5
Backport changes from #45308
2018-01-10 11:16:59 -07:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude
...
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.
This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
2018-01-10 10:29:15 -05:00
Nicole Thomas
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
...
Add watch_in integration test
2017-11-27 15:52:31 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test
2017-11-20 16:53:56 -05:00
Ch3LL
3df70f3fed
remove iter for watch_in failure test
2017-11-20 11:32:26 -05:00
Ch3LL
ac437ddf90
add order check and remove iter
2017-11-20 11:19:25 -05:00
Ch3LL
5f2b4f434e
Add watch_in integration test
2017-11-16 12:18:30 -05: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
