valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,865 Commits 24 Branches 182 Tags 341 MiB
889293cf37
Commit Graph

53 Commits

Author SHA1 Message Date
rallytime
c9fa21f62c
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-02 14:22:07 -05:00
Daniel Wallace
0d340757ad
fix ssh integration test with enable_ssh_minions 
Fix for MacOS
 2018-02-27 10:34:54 -07:00
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
rallytime
49e49ae51b
Mark 2 tests as flaky 
- integration.spm.test_man_spm.SPMManTest.test_man_spm
- integration.ssh.test_state.SSHStateTest.test_state_running
 2018-02-23 09:34:14 -05:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions 
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
 2018-02-20 16:06:00 -07:00
Erik Johnson
2817101041
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-21 21:19:53 -06:00
rallytime
bbe6f54f84
Update old utils paths to new paths 2018-01-12 12:27:08 -05:00
rallytime
a5719b686b
Lint: Remove unused import 2018-01-12 12:17:31 -05:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -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
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/client/ssh/wrapper/state.py
  - salt/modules/yumpkg.py
 2018-01-04 17:45:29 -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
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added 
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
 2017-12-15 12:14:18 -06:00
Erik Johnson
239fc8d774
[PY3] Add unicode literals to the clients and associated files/tests 2017-12-15 00:19:55 -06:00
rallytime
db5866d097
Update old utils paths to new utils paths 2017-12-11 18:43:33 -05:00
rallytime
08c71f13e4
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/thorium/index.rst
  - salt/beacons/__init__.py
  - salt/client/mixins.py
  - salt/client/ssh/wrapper/state.py
  - salt/daemons/masterapi.py
  - salt/grains/extra.py
  - salt/minion.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/mac_user.py
  - salt/modules/napalm_network.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_pkg.py
  - salt/proxy/dummy.py
  - salt/state.py
  - salt/states/file.py
  - salt/states/lxc.py
  - salt/utils/__init__.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_file.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/ssh/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/daemons/test_masterapi.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_disk.py
  - tests/unit/modules/test_napalm_network.py
  - tests/unit/modules/test_state.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_process.py
 2017-12-11 18:24:41 -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
Erik Johnson
1f893d1e95
Fix ssh state.show_top integration test 
63823f3 changed how we handle cases where master_tops and top file
matches both exist in a given environment. This updates the test to
reflect the correct behavior in develop based on the fact that the
master_tops_first config option is set to False.

See: https://github.com/saltstack/salt/pull/44697#issuecomment-347373412
and the subsequent comments in that pull request.
 2017-11-27 18:50:10 -06: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
rallytime
052b13c98e
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/proxy/fx2.py
  - salt/utils/__init__.py
  - salt/utils/jinja.py
  - salt/utils/napalm.py
  - salt/utils/path.py
  - salt/utils/verify.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_service.py
  - tests/unit/utils/test_verify.py
 2017-11-22 12:36:03 -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
rallytime
59ddde4671
Update old util paths to new paths 2017-11-13 12:35:31 -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