Mike Place
69058ae67a
Add flaky decorator to pkg tests
2017-04-06 12:22:40 -06:00
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server
2017-04-05 23:29:13 +01: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
94d944da52
Limit the size of the log records queue
2017-04-05 16:38:05 +01:00
Pedro Algarvio
0c61c151c3
Fix state logic
2017-04-05 02:07:54 +01:00
Pedro Algarvio
de5fdc6ba8
Purge the account
2017-04-05 00:51:35 +01:00
Pedro Algarvio
cd1f7ba629
Let's use the system temp dir as it was to see if it fixes the test failure
2017-04-05 00:34:39 +01:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root.
2017-04-04 18:58:21 +01:00
Pedro Algarvio
dcf0a55daf
Use the test run temporary path, not the system temporary path
2017-04-04 18:58:21 +01:00
Pedro Algarvio
9bbfd6605c
Fix state files temporary path
2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests
2017-04-04 18:58:20 +01:00
Pedro Algarvio
86536e64c5
Make sure files are closed
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
6a638620ba
Move base test case modules to tests.support.case
2017-04-04 18:04:39 +01:00
Pedro Algarvio
9af2ca8823
No need to load all modules docs.
...
This should reduce memory usage as well as speeding up the decorator
2017-04-04 18:04:38 +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
e163a747f1
Minor import fixes
2017-04-04 17:29:34 +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
Mike Place
6056ee302a
Merge pull request #40339 from s0undt3ch/features/py3-pt2
...
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
2017-04-04 10:21:46 -06:00
Mike Place
d254b96498
Merge pull request #40471 from tonybaloney/libcloud_dns_kwargs
...
Update to libcloud_dns module to allow custom kwargs for DNS drivers
2017-04-04 10:12:44 -06:00
Anthony Shaw
8c74d3df89
Update test_libcloud_dns.py
...
add absolute imports
2017-04-04 10:57:32 +10:00
rallytime
ede4c28887
Group checks for failhard setting in () in state.check_failhard function
...
Fixes #38683
When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.
The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.
Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
2017-04-03 14:41:54 -06:00
Pedro Algarvio
863d8d453f
Ignore the unimplemented abstract method
2017-04-01 23:23:50 +01:00
Pedro Algarvio
f5c36f0048
Integration tests should not use the temporary config
2017-04-01 18:33:28 +01:00
Pedro Algarvio
26e60e825c
Allow creating a temporary configuration to be used for a single test
2017-04-01 14:25:55 +01:00
Pedro Algarvio
9a11538b54
Stop using deprecated TestCase methods
2017-04-01 14:22:57 +01:00
Pedro Algarvio
fd6d031804
We now sync all on minion connect
2017-04-01 14:22:56 +01:00
Pedro Algarvio
5950c1dd53
Minor logic fix
2017-04-01 14:22:55 +01:00
Pedro Algarvio
d86dbf466a
Use tests.support.unit instead
2017-04-01 14:22:55 +01:00
Pedro Algarvio
104f7a71f2
Why do need the system grains here?! This is an expensive call.
2017-04-01 14:22:55 +01:00
Pedro Algarvio
f9b58aa2e2
This is not an integration test. Skip test.
...
Skipping tests since I have no clue what is supposed to be tested here
with that `raise Exception(ret)` at the end.
2017-04-01 14:22:53 +01:00
Pedro Algarvio
94c7df78ed
Skip tests on required missing libs
2017-04-01 14:22:53 +01:00
Pedro Algarvio
a013f792c6
We actually need to fix the pip state to recognize new/deprecated options
2017-04-01 14:22:52 +01:00
Pedro Algarvio
22c753afba
Disable pip wheel usage for this test.
...
The pip cache dir will be owned by root and not the user created.
Revisit this issue ASAP.
2017-04-01 14:22:52 +01:00
Pedro Algarvio
0bf7684b8c
Make the option properties available in the config mixin instead
2017-04-01 14:22:51 +01:00
Pedro Algarvio
d05028e88c
These are not integration tests
2017-04-01 14:22:51 +01:00
Anthony Shaw
7ae7b2574a
add utf8 header
2017-04-01 14:05:28 +11:00
Anthony Shaw
9db623ada2
py3 update and lint fixes
2017-04-01 10:14:29 +11:00
Anthony Shaw
c2681db9a4
commit fix and double check in integration test
2017-04-01 09:25:01 +11:00
Anthony Shaw
eb8ab0d75a
add tests to show broken functionlity reported in bug report
2017-04-01 09:21:25 +11:00
Joseph Hall
e24f89366a
Use a slightly more specific bank name
2017-03-31 15:21:26 -06:00
Joseph Hall
3e84d1476a
Add cache.store to the runners
2017-03-31 15:16:36 -06:00
Mike Place
d0ed032364
Merge pull request #40441 from Ch3LL/add_vmware_cloud_tests
...
Add vmware cloud tests
2017-03-31 14:06:25 -06:00
Ch3LL
89d1f3943d
remove unnecessary try blocks
2017-03-31 09:46:34 -06:00
Ch3LL
5cd34a9083
finish the tests
2017-03-30 15:57:53 -06:00
rallytime
607f3e53e8
Add the @flaky decorator to the reactor integration test
...
This test occassionally fails on the develop branch and I cannot
reproduce it. @cachedout recommended to add the flaky decorator
to the test until we can circle back around and look at this more
closely.
2017-03-30 10:42:26 -06:00
Ch3LL
aa95b99608
add snapshot and fix instance test
2017-03-29 17:41:47 -06:00
Nicole Thomas
d0182ac3ef
Merge pull request #40375 from terminalmage/pr-39838
...
Cleanup and resubmit of PR #39838 against develop branch
2017-03-29 10:34:43 -06:00
