saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
120437 commits 34 branches 292 tags 803 MiB
Commit graph

266 commits

Author SHA1 Message Date
Pedro Algarvio
76e50885b0 Fix strings 2021-08-06 13:09:47 -07:00
Pedro Algarvio
e47d5b0bd0 Remove runtests.py and it's supporting code 2021-01-29 13:55:52 -05:00
Pedro Algarvio
a24cd9e583 Logging integration tests were migrated to PyTest 2021-01-05 20:32:04 +00:00
Pedro Algarvio
00df28a015 The reactor tests were migrated to PyTest 2021-01-04 21:21:35 +00:00
Pedro Algarvio
2477ebfb35 Migrate multimaster tests to PyTest 2020-12-04 20:14:37 +00:00
Pedro Algarvio
88a24c3dd0 Revert the changes needed to support runtests.py 2020-08-24 15:09:24 -07:00
Radostin Stoyanov
c9e80ea2a8 Resolve formatting issues 
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
 2020-08-24 15:09:24 -07:00
Radostin Stoyanov
8e5748f590 tests: Add virt minion integration targets 
The virt minion targets are used for integration testing of the virt
module. The targets are based on a container image with preinstalled
libvirt and qemu.

The salt source repository and configuration files are bind-mounted
within the container where a salt-minion instance is started.

The host's network stack (--network=host) is used to allow the
salt-minion inside the container to connect to the salt-master running
on the host.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
 2020-08-24 15:09:24 -07:00
Pedro Algarvio
48e7e20e22 Move setup tests to unit tests. Adjust. 2020-05-13 21:57:54 -07:00
Pedro Algarvio
10a33a9eeb
These are not integration tests. 
Additionally, created a base class which takes care of setup and cleanup
 2020-04-24 09:55:50 +01:00
Ch3LL
487eb1f121 Make sure --run-expensive runtests.py arg works 2020-04-23 15:42:05 -06:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
ch3ll
22cccd2107
Use virtualenv test helper that already exists and fix setup.py 2020-03-16 15:33:43 -04:00
Pedro Algarvio
35646c5ed9
Fix PyLint broad-except 2020-01-03 12:57:52 +00:00
Pedro Algarvio
6513c848bc
Fix PyLint bad-option-value 2020-01-03 10:54:45 +00:00
ch3ll
60a518cb09
Merge branch 'upstream/master' into mf-master 2019-11-04 13:39:09 -05:00
Pedro Algarvio
b5ceafc4cf
Clarify which set of daemons are starting 2019-10-31 11:04:31 +00:00
Ch3LL
355551c83b
Merge remote-tracking branch 2018.3 into master 
Conflicts:
  - .ci/docs
  - .ci/kitchen-amazon2-py2
  - .ci/kitchen-amazon2-py3
  - .ci/kitchen-centos6-py2
  - .ci/kitchen-centos7-py2
  - .ci/kitchen-centos7-py3
  - .ci/kitchen-debian8-py2
  - .ci/kitchen-debian9-py2
  - .ci/kitchen-debian9-py3
  - .ci/kitchen-fedora29-py2
  - .ci/kitchen-fedora29-py3
  - .ci/kitchen-ubuntu1604-py2
  - .ci/kitchen-ubuntu1604-py3
  - .ci/kitchen-ubuntu1804-py2
  - .ci/kitchen-ubuntu1804-py3
  - .ci/kitchen-windows2016-py2
  - .ci/kitchen-windows2016-py3
  - .ci/lint
  - .gitignore
  - .pre-commit-config.yaml
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - doc/topics/releases/2018.3.5.rst
  - noxfile.py
  - pkg/osx/req.txt
  - pkg/windows/req.txt
  - requirements/static/amzn-2018.03.in
  - requirements/static/arch.txt
  - requirements/static/centos-6.txt
  - requirements/static/centos-7.in
  - requirements/static/centos-7.txt
  - requirements/static/cloud.in
  - requirements/static/debian-8.txt
  - requirements/static/debian-9.txt
  - requirements/static/fedora-28.txt
  - requirements/static/fedora-29.txt
  - requirements/static/fedora-30.in
  - requirements/static/lint.in
  - requirements/static/opensuse-42.txt
  - requirements/static/opensuse-leap-15.txt
  - requirements/static/osx.in
  - requirements/static/py2.7/cloud.txt
  - requirements/static/py2.7/lint.txt
  - requirements/static/py2.7/raet-arch.txt
  - requirements/static/py2.7/raet-centos-6.txt
  - requirements/static/py2.7/raet-debian-8.txt
  - requirements/static/py2.7/raet-debian-9.txt
  - requirements/static/py2.7/raet-fedora-30.txt
  - requirements/static/py2.7/raet-opensuse-42.txt
  - requirements/static/py2.7/raet-opensuse-leap-15.txt
  - requirements/static/py2.7/raet-ubuntu-16.04.txt
  - requirements/static/py2.7/raet-ubuntu-18.04.txt
  - requirements/static/py2.7/zeromq-amzn-2018.03.txt
  - requirements/static/py2.7/zeromq-arch.txt
  - requirements/static/py2.7/zeromq-centos-6.txt
  - requirements/static/py2.7/zeromq-centos-7.txt
  - requirements/static/py2.7/zeromq-debian-8.txt
  - requirements/static/py2.7/zeromq-debian-9.txt
  - requirements/static/py2.7/zeromq-fedora-29.txt
  - requirements/static/py2.7/zeromq-fedora-30.txt
  - requirements/static/py2.7/zeromq-opensuse-leap-15.txt
  - requirements/static/py2.7/zeromq-osx.txt
  - requirements/static/py2.7/zeromq-ubuntu-16.04.txt
  - requirements/static/py2.7/zeromq-ubuntu-18.04.txt
  - requirements/static/py2.7/zeromq-windows.txt
  - requirements/static/py3.4/cloud.txt
  - requirements/static/py3.4/zeromq-arch.txt
  - requirements/static/py3.4/zeromq-centos-7.txt
  - requirements/static/py3.4/zeromq-debian-8.txt
  - requirements/static/py3.4/zeromq-debian-9.txt
  - requirements/static/py3.4/zeromq-fedora-29.txt
  - requirements/static/py3.4/zeromq-fedora-30.txt
  - requirements/static/py3.4/zeromq-opensuse-leap-15.txt
  - requirements/static/py3.4/zeromq-ubuntu-16.04.txt
  - requirements/static/py3.4/zeromq-ubuntu-18.04.txt
  - requirements/static/py3.5/cloud.txt
  - requirements/static/py3.5/zeromq-arch.txt
  - requirements/static/py3.5/zeromq-centos-7.txt
  - requirements/static/py3.5/zeromq-debian-8.txt
  - requirements/static/py3.5/zeromq-debian-9.txt
  - requirements/static/py3.5/zeromq-fedora-29.txt
  - requirements/static/py3.5/zeromq-fedora-30.txt
  - requirements/static/py3.5/zeromq-opensuse-leap-15.txt
  - requirements/static/py3.5/zeromq-osx.txt
  - requirements/static/py3.5/zeromq-ubuntu-16.04.txt
  - requirements/static/py3.5/zeromq-ubuntu-18.04.txt
  - requirements/static/py3.5/zeromq-windows.txt
  - requirements/static/py3.6/cloud.txt
  - requirements/static/py3.6/zeromq-arch.txt
  - requirements/static/py3.6/zeromq-centos-7.txt
  - requirements/static/py3.6/zeromq-debian-8.txt
  - requirements/static/py3.6/zeromq-debian-9.txt
  - requirements/static/py3.6/zeromq-fedora-29.txt
  - requirements/static/py3.6/zeromq-fedora-30.txt
  - requirements/static/py3.6/zeromq-opensuse-leap-15.txt
  - requirements/static/py3.6/zeromq-osx.txt
  - requirements/static/py3.6/zeromq-ubuntu-16.04.txt
  - requirements/static/py3.6/zeromq-ubuntu-18.04.txt
  - requirements/static/py3.6/zeromq-windows.txt
  - requirements/static/py3.7/cloud.txt
  - requirements/static/py3.7/zeromq-arch.txt
  - requirements/static/py3.7/zeromq-centos-7.txt
  - requirements/static/py3.7/zeromq-debian-8.txt
  - requirements/static/py3.7/zeromq-debian-9.txt
  - requirements/static/py3.7/zeromq-fedora-29.txt
  - requirements/static/py3.7/zeromq-fedora-30.txt
  - requirements/static/py3.7/zeromq-opensuse-leap-15.txt
  - requirements/static/py3.7/zeromq-osx.txt
  - requirements/static/py3.7/zeromq-ubuntu-16.04.txt
  - requirements/static/py3.7/zeromq-ubuntu-18.04.txt
  - requirements/static/py3.7/zeromq-windows.txt
  - requirements/static/ubuntu-14.04.txt
  - requirements/static/ubuntu-16.04.txt
  - requirements/static/windows.in
  - salt/client/mixins.py
  - salt/crypt.py
  - salt/daemons/flo/core.py
  - salt/daemons/flo/worker.py
  - salt/daemons/flo/zero.py
  - salt/engines/http_logstash.py
  - salt/engines/logstash_engine.py
  - salt/modules/beacons.py
  - salt/modules/chocolatey.py
  - salt/modules/cron.py
  - salt/modules/file.py
  - salt/modules/gpg.py
  - salt/modules/http.py
  - salt/modules/state.py
  - salt/modules/win_file.py
  - salt/modules/win_task.py
  - salt/states/file.py
  - salt/states/pip_state.py
  - salt/states/saltmod.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/cloud.py
  - salt/utils/napalm.py
  - salt/utils/schedule.py
  - salt/utils/vmware.py
  - salt/utils/yamlloader.py
  - tests/integration/__init__.py
  - tests/integration/client/test_kwarg.py
  - tests/integration/cloud/clouds/test_ec2.py
  - tests/integration/cloud/clouds/test_gogrid.py
  - tests/integration/cloud/clouds/test_oneandone.py
  - tests/integration/cloud/clouds/test_vmware.py
  - tests/integration/cloud/clouds/test_vultrpy.py
  - tests/integration/files/pillar/base/top.sls
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_state.py
  - tests/integration/modules/test_system.py
  - tests/integration/modules/test_win_lgpo.py
  - tests/integration/shell/test_call.py
  - tests/integration/states/test_beacon.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_pkg.py
  - tests/support/generate-names-file-from-failed-test-reports.py
  - tests/support/gitfs.py
  - tests/support/helpers.py
  - tests/unit/modules/test_file.py
  - tests/unit/modules/test_gpg.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_file.py
  - tests/unit/modules/test_win_lgpo.py
  - tests/unit/states/test_file.py
  - tests/unit/states/test_pip_state.py
  - tests/unit/test_loader.py
  - tests/unit/utils/test_pycrypto.py
  - tests/unit/utils/test_schema.py
 2019-10-16 10:17:36 -04:00
rallytime
4a218142a5
Remove support for RAET 
Conflicts:
* doc/topics/releases/neon.rst
* requirements/tests.txt
* salt/cli/caller.py
* salt/daemons/test/__init__.py
* salt/daemons/test/test_minion.py
* salt/daemons/test/test_saltkeep.py
* salt/modules/event.py
* salt/modules/raet_publish.py
* salt/transport/__init__.py
* salt/utils/parsers.py
* setup.py
* tests/unit/modules/test_raet_publish.py
 2019-10-10 09:46:39 +01:00
Dmitry Kuzmenko
9d280980a8
Merge branch '2019.2.1' into 2019.2.1_with_multimaster_bb_fixes 2019-08-22 12:54:46 +03:00
Pedro Algarvio
566c620e35
Exit the test suite if one of the test daemons fails to start 2019-08-20 22:58:39 +01:00
Dmitry Kuzmenko
b7a10581a2
Minor: Better support of named multimaster tests. 
This change is not related to any tets failures and current CI
configuration at all.
 2019-08-19 22:54:00 +03:00
Dmitry Kuzmenko
db0bae82ed
Run multimaster as well tests when no specific group is set 2019-08-18 14:00:48 +03:00
Dmitry Kuzmenko
65dc47c300
Multimaster tests environment and test module test. 2019-08-18 14:00:47 +03:00
Wayne Werner
a1c6bcff6e
Use six.reraise for the greater good 
In Python2, `raise exc` obliterates the stack trace. That's no good.

Fortunately, six has a useful syntax that works across Python versions.
It does have the downside of adding `reraise` to the stacktrace, but
otherwise, this should be better.
 2019-05-21 12:27:13 -05:00
Ch3LL
0a6613f78f
Revert "Make sure --run-expensive runtests.py arg works" 
This reverts commit 56bf069079.
 2019-05-13 14:48:33 -04:00
Ch3LL
368c012f12
Revert "Make sure --run-expensive runtests.py arg works" 
This reverts commit 56bf069079.
 2019-05-13 14:45:12 -04:00
Ch3LL
2acb0f37bc
Make sure --run-expensive runtests.py arg works 2019-05-08 13:16:45 +01:00
Ch3LL
56bf069079
Make sure --run-expensive runtests.py arg works 2019-04-24 18:11:57 -04:00
rallytime
3f2712fbc1
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - tests/unit/states/test_virt.py
  - tests/unit/test_config.py
 2018-10-29 12:36:28 -04:00
Erik Johnson
b851a41ef8
Don't run unit or integration tests unnecessarily 
If --from-filenames (and optionally --filename-map) yield no matches,
this will keep from running the entire unit/integration suite.
 2018-10-23 14:21:21 -05:00
rallytime
9298304ce9
Merge branch '2018.3' into 'fluorine' 
No conflicts.
 2018-09-19 14:07:06 -04:00
rallytime
d19c67f619
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-09-19 09:59:32 -04:00
William Giokas
fde757517f
Order the runtests suites 
Uses an ordered dictionary instead of a default python dict when
describing the `TEST_SUITES` variable. Sorts alphabetically based on the
name of the suite.
 2018-09-18 10:04:02 -04:00
Erik Johnson
80dcb44a0d
Merge remote-tracking branch 'upstream/2018.3' into merge-fluorine 
Conflicts:
- salt/utils/mac_utils.py
- tests/unit/config/test_config.py
- tests/unit/loader/test_globals.py
- tests/unit/ssh/test_ssh.py
- tests/unit/templates/test_jinja.py
- tests/unit/utils/vmware/test_host.py
- tests/unit/utils/vmware/test_license.py
 2018-08-17 07:52:59 -05:00
Erik Johnson
d56dcdd608
Rename "providers" dir to "clouds" to respect naming convention 2018-08-14 13:53:30 -05:00
Gareth J. Greenaway
8f4d55666e
Updaitng runtests.py for logging tests. 2018-07-31 09:19:06 -07:00
Gareth J. Greenaway
ca4dd6c873
Adding integration/logging to runtests.py 2018-07-31 09:19:06 -07:00
Daniel Wallace
f941ea265f
add running sdb tests 2018-07-17 13:06:15 -05:00
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Daniel A. Wozniak
2605ff8712
Gracefully handle blank lines in whitelist.txt 2018-05-07 13:35:00 -07:00
rallytime
0eab957281
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_git.py
  - tests/unit/modules/test_tls.py
 2018-04-20 15:40:49 -04:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
Daniel A. Wozniak
cadd759727
Use warnings to warn user 2018-04-19 08:26:50 -07:00
Daniel A. Wozniak
144c68e214
Allow non admin name based runs on windows 2018-04-19 00:18:17 -07:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/proxy/all/salt.proxy.cimc.rst
  - doc/ref/proxy/all/salt.proxy.panos.rst
  - doc/topics/releases/2018.3.0.rst
  - salt/modules/cmdmod.py
  - salt/modules/state.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_state.py
 2018-04-05 13:25:46 -04:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
 2018-04-03 14:33:11 -04:00
Erik Johnson
bbfd35d3ea
Replace flaky SPM man test 
This replaces a test that has been intermittently failing, and also
expands it to check for _all_ man pages.
 2018-03-29 12:19:41 -05:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00