Commit Graph

37 Commits

Author SHA1 Message Date
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
2018-01-22 07:33:42 -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
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
b4b59b89cd
remove platform from salt.utils call for 2017.7 2018-01-04 14:42:30 -05:00
Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX 2018-01-03 13:58:28 -05:00
Ch3LL
aeb5f4e248
Add state.running ssh integration test 2017-12-06 13:23:55 -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
Nicole Thomas
cc05481026
Merge pull request #44659 from Ch3LL/ssh_sls_id
Add state.sls_id to ssh wrapper and tests
2017-11-29 09:41:47 -05:00
Nicole Thomas
97ec0e6ea0
Merge branch '2017.7' into ssh_pillar_items 2017-11-29 09:39:38 -05:00
Gareth J. Greenaway
642eed11e1
Merge pull request #44698 from Ch3LL/mine_ssh
Add salt-ssh mine.get integration test
2017-11-28 14:15:28 -08:00
Ch3LL
c7f5af1274
Add pillar ssh integration tests 2017-11-28 12:19:41 -05:00
Ch3LL
974db59dc1
convert the assert to a union set instead 2017-11-28 10:57:55 -05:00
Ch3LL
add43c4cfe
Sort the show_top results for test_state_show_top test 2017-11-28 10:43:45 -05:00
Ch3LL
9e67babf85
Add teardown to remove ssh dir 2017-11-27 16:51:02 -05:00
Ch3LL
f90b4f7653
Add salt-ssh mine.get integration test 2017-11-27 16:38:19 -05:00
Ch3LL
04b5a3dd4e
Add state.sls_id to ssh wrapper and tests 2017-11-22 16:01:37 -05:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test 2017-11-20 17:37:38 -05:00
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests 2017-11-15 11:41:28 -05:00
Nicole Thomas
1da1a97d7d
Merge pull request #44490 from Ch3LL/ssh_ping
Enable test_deploy ssh test
2017-11-13 12:12:47 -05:00
Ch3LL
3dc8673417
change class name to raw 2017-11-10 14:47:42 -05:00
Ch3LL
308596ac8d
Add salt-ssh raw integration tests 2017-11-10 14:47:38 -05:00
Ch3LL
e952cd6712
Enable test_deploy ssh test 2017-11-10 13:35:13 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables 2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh 2017-11-10 10:48:30 -05:00
Ch3LL
5d1a9af4b5
Add salt-ssh grains.items test 2017-11-08 13:41:11 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01: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
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
c981914800 More Pylint 2014-05-23 15:27:19 -06:00
Mike Place
7abc25f67f Generate server keys too 2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53 Working salt-ssh test runner
This rounds out initial (alpha) support for a salt-ssh test runner.

At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.

Conflicts:
	tests/integration/__init__.py
	tests/integration/files/conf/_ssh/sshd_config
	tests/integration/files/conf/sshd_config
	tests/integration/files/ext-conf/sshd_config
2014-05-23 14:11:14 -06:00
Pedro Algarvio
df802117b1 Remove extra new line 2014-05-10 15:09:13 +01:00
Pedro Algarvio
592c669f75 Add coding header 2014-05-10 14:42:41 +01:00
Mike Place
0cbac67a3f Support for continuous integration testing of salt-ssh 2014-05-10 14:18:53 +01:00