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
Frode Gundersen
dfb68f32d2
fix if statements and string
2017-12-19 19:45:19 +00: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
Frode Gundersen
3504083849
add pkg_latest_version test
2017-12-04 20:28:52 +00: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
Ch3LL
9b7421b261
Change check to the state id
2017-11-29 10:15:56 -05:00
Ch3LL
9cc853e3d5
Add masterless state.highstate integration test
2017-11-29 10:15:56 -05:00
Nicole Thomas
2dc3e5c42a
Merge pull request #44613 from Ch3LL/pillar_masterless
...
Add pillar.items test for masterless
2017-11-29 09:43:10 -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
Nicole Thomas
2c2e1e2332
Merge branch '2017.7' into pillar_masterless
2017-11-28 13:35:12 -05:00
rallytime
1bbe1abeb2
Allow --static option to display state runs with highstate output
...
Fixes #44556
2017-11-28 13:10:37 -05: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
Nicole Thomas
f6a72acfe3
Merge branch '2017.7' into mine_ssh
2017-11-27 17:01:51 -05:00
Nicole Thomas
f2f6817e86
Merge pull request #44608 from Ch3LL/ssh_jinja
...
Add jinja to ssh sls test file
2017-11-27 17:00:27 -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
Nicole Thomas
5ec7ea0bb5
Merge pull request #44572 from Ch3LL/watchin_test
...
Add watch_in integration test
2017-11-27 15:52:31 -05:00
Frode Gundersen
619bd2be1e
fix lint error
2017-11-22 21:41:59 +00:00
Ch3LL
04b5a3dd4e
Add state.sls_id to ssh wrapper and tests
2017-11-22 16:01:37 -05:00
Ch3LL
b3b5ecc6ff
Add pillar.items test for masterless
2017-11-22 15:40:57 -05:00
Frode Gundersen
d406cb07a3
add status.pid test
2017-11-22 18:11:39 +00:00
Nicole Thomas
df669b551d
Merge branch '2017.7' into ssh_jinja
2017-11-22 11:20:01 -05:00
Nicole Thomas
d6ccf4bb30
Merge pull request #44616 from Ch3LL/nonbase_test
...
Add Non Base Environement salt:// source integration test
2017-11-22 11:13:53 -05:00
Nicole Thomas
0a54584ddb
Merge branch '2017.7' into watchin_test
2017-11-22 11:10:55 -05:00
Nicole Thomas
071a1bd65b
Merge branch '2017.7' into thindir_ssh
2017-11-21 22:23:09 -05:00
Nicole Thomas
80b71652e3
Merge branch '2017.7' into nonbase_test
2017-11-21 22:23:00 -05:00
Ch3LL
359a59dd64
Add salt-key -d integration test
2017-11-21 10:40:25 -05:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test
2017-11-20 17:37:38 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test
2017-11-20 16:53:56 -05:00
Mike Place
898c28e6d9
Merge branch '2017.7' into watchin_test
2017-11-20 19:00:45 +00:00
Ch3LL
ca97517795
Add jinja to ssh sls test file
2017-11-20 12:26:09 -05:00
Ch3LL
3df70f3fed
remove iter for watch_in failure test
2017-11-20 11:32:26 -05:00
Ch3LL
ac437ddf90
add order check and remove iter
2017-11-20 11:19:25 -05:00
Nicole Thomas
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
...
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test
...
Add service.running integration state test
2017-11-16 17:27:56 -05:00
Ch3LL
7536150567
Add service.running integration state test
2017-11-16 14:12:59 -05:00
Ch3LL
5f2b4f434e
Add watch_in integration test
2017-11-16 12:18:30 -05:00
Ch3LL
913eedc699
Add multiple salt-ssh state integration tests
2017-11-15 11:41:28 -05:00
twangboy
47114fdb30
Pass root_dirs to the win_verify_env function
...
Remove while loop that was hanging when `salt` wasn't in the path
Add salt.util.path.safe_path function to check for unsafe paths
Pass root_dir to all calls to `verify_env`
2017-11-13 13:05:23 -07:00
Nicole Thomas
caa81728a0
Merge pull request #44507 from Ch3LL/pillar_time
...
Increase sleep timeout for pillar refresh test
2017-11-13 13:29:05 -05:00
Mike Place
69a50204a6
Add newline for lint.
2017-11-13 11:16:33 -07: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
ffa4bddcad
Increase sleep timeout for pillar refresh test
2017-11-13 10:50:16 -05:00
Nicole Thomas
18624d6798
Merge pull request #44491 from Ch3LL/ssh_raw
...
Add salt-ssh raw integration tests
2017-11-13 10:47:11 -05:00
Gabe Van Engel
ef7b6bbb81
Fixed issue with file.line on Windows running Python 2.
...
The target file was being read as binary, but written as text, causing file.line to append an extra linesep on every line.
Added integration test to ensure file.line produces the expected content.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
8f89c99fa5
Fix FileModuleTest setUp and tearDown to work on Windows.
2017-11-12 23:55:35 -08:00
Gabe Van Engel
b2b8f075b9
Fixed test to work on Windows.
2017-11-12 23:55:34 -08:00
Gabe Van Engel
5a5a2dd026
Added integration test for issue #41474
2017-11-12 23:55:33 -08: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
Nicole Thomas
5b95495e75
Merge pull request #44484 from Ch3LL/orch_test
...
Add orchestration tests when target exists or not
2017-11-10 12:24:21 -07:00
Nicole Thomas
62c42ca6fb
Merge pull request #44480 from Ch3LL/override_pillar
...
Add integration pillar command line test
2017-11-10 12:14:31 -07:00
Ch3LL
e952cd6712
Enable test_deploy ssh test
2017-11-10 13:35:13 -05:00
