Steve Groesz
715df9a911
Add test for new kernelversion grain
2017-04-19 17:46:00 -05: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
7b713d9256
Use the more portable helper skip_if_not_root.
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
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
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
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
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
104f7a71f2
Why do need the system grains here?! This is an expensive call.
2017-04-01 14:22:55 +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
Pedro Algarvio
6dcf7552a7
Py3 fixes. Tests are not destructive.
2017-03-28 19:04:04 +01:00
Pedro Algarvio
6f79dd6af3
Not an integration test
2017-03-28 19:00:51 +01:00
Ch3LL
aae2a30eda
add require_in for an entire sls test
2017-03-27 12:47:36 -06:00
Nicole Thomas
201846ff01
Merge pull request #40129 from terminalmage/py3-tests
...
Python 3 compatibility fixes
2017-03-17 17:49:26 -06:00
Erik Johnson
8676f7d14a
Add pip3 to list of commands in which_bin test
2017-03-16 22:07:52 -05:00
rallytime
148df32604
Merge branch '2016.11' into 'develop'
...
No conflicts.
2017-03-15 14:52:07 -06:00
rallytime
029f28bbd5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/cmdmod.py
2017-03-14 15:44:38 -06:00
Nicole Thomas
0ec81a4cde
Fixup a syntax error
2017-03-14 11:15:02 -06:00
Erik Johnson
5d84b40bfd
Attempt to fix failing grains tests in 2016.3
...
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.
Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
2017-03-14 11:25:15 -05:00
rallytime
4a52cca926
Pylint fixes
2017-03-09 14:55:33 -07:00
Pedro Algarvio
4627c4ea6d
Code cleanup and make sure the beacons config file is deleted after testing
...
Conflicts:
- tests/integration/modules/beacons.py
2017-03-09 13:35:16 -07:00
Pedro Algarvio
50e51b5b9d
The beacons configuration is now a list. Handle it!
2017-03-09 13:00:41 -07:00
Pedro Algarvio
680bbec79f
The beacons configuration is now a list. Handle it!
2017-03-09 19:31:13 +00:00
Pedro Algarvio
dd53f055b9
Code cleanup and make sure the beacons config file is deleted after testing
2017-03-09 19:29:16 +00:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version
2017-03-08 19:22:33 +00:00
Pedro Algarvio
b58241648a
Use the tests support paths module
2017-03-08 18:34:34 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3
2017-03-08 18:34:33 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves
2017-03-08 18:34:32 +00:00
Pedro Algarvio
c436d9f2f6
This no longer applies.
2017-03-08 18:34:31 +00:00
Pedro Algarvio
7dc6b64689
No need to call .keys() when iterating a dictionary
2017-03-06 14:42:31 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes
2017-03-06 14:35:16 +00:00
Mike Place
c10abec6d3
Merge pull request #39797 from twangboy/win_fix_test_git
...
Fix test_worktree_add_rm test for Windows
2017-03-04 09:12:12 -07:00
twangboy
2a6e61a42e
Add encode for Py3 compatability
2017-03-03 10:53:12 -07:00
twangboy
54891a57b1
Fix type in second worktree_path
2017-03-03 10:24:28 -07:00
twangboy
25938ebc8e
Fix test_add_user_to_group for Windows
2017-03-02 15:40:22 -07:00
twangboy
ef53ec7efe
Fix test_worktree_add_rm test for Windows
2017-03-02 14:37:53 -07:00
Pedro Algarvio
979090d225
We need bytes under Py3 to compute the hash
2017-03-02 19:56:04 +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
7278a6c868
You need to pass a list. How did this ever pass?!
2017-02-28 22:52:48 +00:00
