Nicole Thomas
22c3efda06
Merge pull request #45371 from rallytime/bp-45158
...
Back-port #45158 to 2017.7
2018-01-11 12:51:37 -05:00
Erik Johnson
ff3039db6c
Skip flaky test on 2017.7 branch
...
The behavior of the set union used to combine ext_nodes and top file
matches is not consistent on Python 3 (well, 3.5 at least), and this
produces flaky test results.
Since we do not change things like the state compiler in point
releases, the method used to combine the ext_nodes and top file matches
has been changed for Oxygen and is now fully deterministic. This test
will therefore be skipped for the remainder of the 2017.7 release cycle
on Python 3.
Fixes https://github.com/saltstack/salt-jenkins/issues/686 .
2018-01-10 16:02:32 -06:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests
...
This was the _actual_ cause of the failing test in the state module
integration tests.
2018-01-10 10:29:15 -05: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
fb87010461
Merge pull request #45297 from Ch3LL/mac_service_state
...
Allow macosx service state tests to check for pid return
2018-01-09 15:47:23 -05:00
Nicole Thomas
8d04c2b3d4
Merge pull request #44856 from Ch3LL/running_test
...
Add state.running ssh integration test
2018-01-08 16:40:49 -05:00
Ch3LL
9a35a73711
add time limit to while loop
2018-01-05 16:18:31 -05:00
Ch3LL
4e569b5802
Allow macosx service state tests to check for pid return
2018-01-05 12:25:44 -05:00
Daniel Wallace
cf98ed472e
fix up symlinks
2018-01-04 17:29:45 -05:00
Nicole Thomas
2934b60d53
Merge pull request #45254 from Ch3LL/fix_mac_grain_ssh
...
Add darwin value for ssh grain items tests on MacOSX
2018-01-04 16:31:34 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm
...
man_spm_test
2018-01-04 15:58:01 -05:00
Ch3LL
b4b59b89cd
remove platform from salt.utils call for 2017.7
2018-01-04 14:42:30 -05:00
Ch3LL
74e6ed60ea
Fix MacOSX Service Status Check and integration test
2018-01-03 17:19:51 -05:00
Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX
2018-01-03 13:58:28 -05:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7'
2018-01-02 15:21:58 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests
2018-01-02 12:29:43 -05:00
rallytime
a26d4795bd
[2017.7] Fix docstring integration test failure
2017-12-28 10:59:16 -05:00
Gareth J. Greenaway
48eafe3206
Adding some tests to tests cmd.script with cwd
2017-12-21 15:53:38 -08:00
Nicole Thomas
b49ee97938
Merge pull request #45124 from gtmanfred/2017.7
...
enable using kitchen-salt with ec2 on 2017.7
2017-12-21 14:11:27 -05:00
Daniel Wallace
23bd38ad66
enable using kitchen-salt on ec2
...
These changes are needed to run the test suite on ec2 using sudo.
2017-12-20 17:18:39 -07:00
Nicole Thomas
42e894570d
Merge pull request #45087 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-20 17:24:50 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp
2017-12-20 14:40:10 -05:00
rallytime
fe81e2d39a
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-12-20 10:26:10 -05:00
Erik Johnson
80b6bd6813
Fix integration.states.test_pip.PipStateTest.test_pip_installed_weird_install
...
Carbon 1.1.1 for some reason added six to their setup.py, which breaks
this test since it's not installed into the virtualenv. This PR forces
this test to use a version of carbon which does not dep on six in its
setup.py.
2017-12-20 06:54:30 -05:00
Nicole Thomas
e0d7b330fa
Merge pull request #44650 from frogunder/status
...
add status.pid test
2017-12-19 11:21:08 -05:00
Frode Gundersen
48e6953e1f
fix_string_error
2017-12-14 22:40:59 +00:00
Frode Gundersen
c9fa4ed2a7
man_spm_test
2017-12-11 19:52:32 +00:00
Nicole Thomas
54d29a61cb
Merge pull request #44787 from rallytime/groupadd-destructive-clean
...
GroupAdd test: Add destructive test decorator to entire class
2017-12-11 13:14:17 -05:00
rallytime
23c5a4ca3e
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_pkg.py
- salt/states/file.py
- tests/integration/states/test_file.py
- tests/unit/states/test_file.py
2017-12-07 17:33:03 -05:00
Gareth J. Greenaway
edcd581ca5
Merge branch '2017.7' into win_fix_file.managed
2017-12-07 10:00:55 -08:00
Nicole Thomas
74ee7ce541
Merge pull request #44748 from twangboy/osx_fix_auto_login
...
Fix auto login support for OSX
2017-12-07 09:22:22 -05:00
Ch3LL
aeb5f4e248
Add state.running ssh integration test
2017-12-06 13:23:55 -05:00
Nicole Thomas
904c0da893
Merge branch '2017.7' into status
2017-12-06 12:51:52 -05:00
Nicole Thomas
019169ed61
Merge pull request #44824 from Ch3LL/spm_args
...
Add spm -y and -f arg integration tests
2017-12-05 16:49:31 -05:00
Ch3LL
d8f81d2e4d
fix pylint
2017-12-05 14:39:36 -05:00
Nicole Thomas
59b930668c
Merge pull request #44742 from Ch3LL/cloud_action_test
...
Add salt-cloud action rename integration test
2017-12-05 12:44:49 -05:00
Ch3LL
951d09ca2f
remove unnecessary try/except block
2017-12-04 16:18:01 -05:00
Ch3LL
c329ced7ee
Add salt-cloud action rename integration test
2017-12-04 16:16:08 -05:00
Ch3LL
61ac5cf157
Add spm -y and -f arg integration tests
2017-12-04 16:06:14 -05:00
twangboy
a27bb6993a
Fix py3 error
2017-12-04 14:05:54 -07:00
twangboy
187bc1e61e
Add back the try/finally blocks
2017-12-04 14:05:54 -07:00
twangboy
d7241d004f
Fix 2 more tests
2017-12-04 14:05:54 -07:00
twangboy
d5dd42aebe
Fix integration tests for Windows
2017-12-04 14:05:53 -07:00
twangboy
af5565859e
Use file functions for symlink and remove
2017-12-04 14:05:53 -07:00
twangboy
068e463870
Fix lint, add integration tests
2017-12-04 13:29:37 -07:00
Erik Johnson
153bf45b03
Fix regression in file.managed when source_hash used with local file
...
This ensures that we enforce the passed source_hash when the source is a
file local to the minion.
2017-12-03 00:01:44 -06:00
rallytime
3d9eafc4bd
Lint: Remove extra empty lines at end of files
2017-12-01 14:46:27 -05:00
rallytime
817ac002b0
Add destructive test decorator to test class
...
Because the destructive test decorator was applied to the tearDown
function, the tests show a stacktrace instead of a nice skip message
when running without the `--run-destructive` flag. By applying the
decorator to the test class (since all tests are destructive anyway)
we can keep the output clean and still skip tests appropriately.
2017-12-01 14:33:38 -05:00
rallytime
239f3511bf
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/reg.py
- salt/modules/state.py
- salt/modules/win_pkg.py
- salt/netapi/rest_cherrypy/app.py
- salt/utils/__init__.py
- tests/integration/modules/test_file.py
- tests/integration/output/test_output.py
- tests/unit/grains/test_core.py
2017-12-01 11:12:44 -05:00
Nicole Thomas
e5a1401b82
Merge pull request #44712 from Ch3LL/ssh_pillar_items
...
Add pillar ssh integration tests
2017-11-30 10:29:32 -05:00
