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 4
121849 commits 34 branches 292 tags 803 MiB
Commit graph

76 commits

Author SHA1 Message Date
twangboy
79d4ff772a Change repo.saltproject.io to new url 2025-01-11 15:25:01 -07:00
Daniel A. Wozniak
58f448405b Use broadcom.com instead of repo.saltproject.io for test_cp 2025-01-11 15:25:01 -07:00
Pedro Algarvio
03ad4c6337 Update code to be Py3.7+ to reduce merge forward conflicts 2024-02-29 10:16:58 +00:00
Pedro Algarvio
b9be2dec1b Update and remove obsolete pylint plugins 2024-02-27 08:07:04 +00:00
Pedro Algarvio
3ed6e05262 Don't use hashlib.md5 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-14 20:42:57 +00:00
Pedro Algarvio
672f6586d7 The repo.saltproject.io index.html file changed it's contents. Fix tests. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-04-19 16:56:12 +01:00
Pedro Algarvio
d990363f8a Stop using @skipIf 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
9cf6b752e0 Replace the usage of @skipIf(...) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
4d49013247 Update to isort 5.10.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-01 12:49:16 -06:00
Pedro Algarvio
29b6fe207c Updates required for `pytest-salt-factories>=1.0.0rc16` 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-06-02 07:05:09 -06:00
Megan Wilhite
4b9a16451b Update the ftp url in the cp tests 2022-04-18 14:31:00 +01:00
Bryce Larson
73cc8d6120 change repo.saltstack.com to repo.saltproject.io 2021-08-16 14:20:43 -04:00
Pedro Algarvio
6abb43d2df Upgrade to black 21.7b0 2021-08-06 13:09:47 -07:00
Pedro Algarvio
aef8fdc3d3 Bump to pytest-salt-factories >= 0.903.x 2021-05-28 14:48:59 -07:00
Pedro Algarvio
188107d096 Drop Py2 and six on tests/integration/modules/test_cp.py 2021-03-01 10:42:23 +00:00
Pedro Algarvio
cd004c9e8a Replace @skip_if_not_root with @pytest.mark.skip_if_not_root 2021-02-03 10:15:33 +00:00
Pedro Algarvio
75e9655d10 Replace @slowTest with @pytest.mark.slow_test 2021-02-03 06:30:11 +00:00
Gareth J. Greenaway
0e5cd6e52f Fixing various tests that test the state system. Adding temp_state_directory helper for when we want to add a temporary state into a directory in the Salt root. 2021-02-02 07:39:08 -05:00
Pedro Algarvio
804e5372d4 Drop Py2 and six on tests/integration/modules/test_cp.py 2021-02-01 11:21:01 +00:00
Pedro Algarvio
ef9237e056 Upgrade to pytest-salt-factories 0.10.x 2020-05-07 16:00:11 -07:00
Pedro Algarvio
2209c25bf9 Add --run-slow flag to runtests.py 2020-05-07 13:09:02 -07:00
Wayne Werner
332f129e90
Skip slowest tests 2020-04-21 11:23:32 -05:00
Pedro Algarvio
6ba04cc7da
Add windows test whitelisting as pytest markers 
Taken out from the pytest migration PR
 2020-04-16 16:57:59 +01:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Daniel Wozniak
8bcf845c5e
Merge pull request #55052 from garethgreenaway/55019_fileclient_ftp_port_fix 
[master] Fix to fileclient for ftp connections
 2020-01-05 11:45:28 -07:00
Pedro Algarvio
6fca5e5098
Fix PyLint arguments-differ 2020-01-03 12:57:47 +00:00
Daniel A. Wozniak
5b8bc65d9b
Fix typo 2019-12-14 02:43:18 +00:00
Daniel A. Wozniak
b9ec84a166
Less flaky test_get_url_https_no_dest test 2019-12-14 02:28:50 +00:00
Daniel Wozniak
6f725466d7
Merge branch 'master' into 55019_fileclient_ftp_port_fix 2019-12-09 17:33:17 -07:00
ch3ll
33bc5bd840
Merge remote branch 'upstream/master' into mf-master 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/integration/states/test_docker_container.py
  - tests/integration/states/test_ssh_known_hosts.py
  - tests/support/runtests.py
  - tests/unit/modules/test_win_file.py
  - tests/unit/modules/test_zcbuildout.py
  - tests/unit/states/test_zcbuildout.py
 2019-12-04 15:50:25 -05:00
Daniel Wozniak
3fea677d85
Merge branch 'master' into 55019_fileclient_ftp_port_fix 2019-12-03 08:30:55 -07:00
Pedro Algarvio
ac0db895ab
Prefer RUNTIME_VARS usage 2019-12-03 15:22:34 +00:00
Megan Wilhite
8db5802587
Merge branch 'master' into mf-master 2019-11-14 09:35:58 -05:00
Gareth J. Greenaway
7cafdd3066
When an FTP URL is passed along to cp.get_url when urlparse parses the URL the port attribute ends up as None. The comparison that then takes place in ftplib errors out when comparing a None type to an int. This PR checks to see if the port is valid and if not sets it to the default FTP port. 2019-10-17 16:30:12 -07: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
Gareth J. Greenaway
2803105a2d
Porting PR #54154 to 2019.2.1 2019-09-18 16:59:36 -07:00
Gareth J. Greenaway
1974f110bc
Disabling a couple more tests in integration.modules.test_cp that hang on OS X and Py2. 2019-06-20 11:58:24 -07:00
Gareth J. Greenaway
1d4e228f15
Updating various skips for tests to only skip if OS is OS X and Python is Python2. 2019-06-20 07:04:21 -07:00
Gareth J. Greenaway
01dafdc6fc
Skipping integration.modules.test_cp.CPModuleTest.test_get_file_str_https on OS X 2019-06-20 07:04:21 -07:00
Pedro Algarvio
3e9d22abb1
Merge branch '2017.7' into 2018.3 
Conflicts:
* .codeclimate.yml
* requirements/static/py2.7/raet-windows.txt
* requirements/static/py2.7/tcp-windows.txt
* requirements/static/py2.7/zeromq-windows.txt
* requirements/static/py3.5/raet-windows.txt
* requirements/static/py3.5/tcp-windows.txt
* requirements/static/py3.5/zeromq-windows.txt
* requirements/static/py3.6/raet-windows.txt
* requirements/static/py3.6/zeromq-windows.txt
* requirements/static/windows.in
* salt/payload.py
* salt/states/pip_state.py
* tests/integration/modules/test_cp.py
* tests/integration/modules/test_pip.py
* tests/unit/config/test_config.py
* tests/unit/fileserver/test_gitfs.py
* tests/unit/states/test_pip_state.py
 2019-05-09 11:36:57 +01:00
Daniel A. Wozniak
0ce086d13d
Fix remaining failures on ubuntu 1404 and add to PR tests 2019-05-08 13:16:49 +01:00
Daniel A. Wozniak
6648bf25ab
fix linter 2019-04-29 08:38:16 +00:00
Daniel A. Wozniak
8a84050089
Cherry-pick test fix 2019-04-29 08:30:41 +00:00
Daniel A. Wozniak
b23c865c15
Fix remaining failures on ubuntu 1404 and add to PR tests 2019-04-28 22:49:19 +00:00
twangboy
9464af259a
Skip test_getI_file_templated_paths on Windows/Py3 2019-01-22 15:42:37 -07:00
Erik Johnson
1fde50d84a
Mark integration.modules.test_cp.CPModuleTest.test_get_file_str_https as flaky 
There appears to be something weird with the DNS resolution on the AWS
Arch boxes. This test fails because it fails to resolve
repo.saltstack.com, and I can reproduce this using an AWS instance via
TestKitchen, but if I run the test again it works.

By marking this test as flaky we can make it reattempt (when necessary)
and get it to pass.
 2018-12-07 09:25:08 -06:00
rallytime
2317b5ef58
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - tests/integration/modules/test_win_ntp.py
 2018-09-04 12:01:38 -04:00
Daniel A. Wozniak
f214929740 Fix a flaky test and mark another as flaky 2018-08-31 20:20:10 +00:00
rallytime
f7226f400f
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/osx/build_env.sh
  - salt/modules/win_useradd.py
  - salt/utils/yamldumper.py
  - tests/integration/modules/test_archive.py
  - tests/integration/output/test_output.py
 2018-08-30 14:23:23 -04:00
Daniel Wallace
be7c041d75
add test 2018-08-28 21:14:05 -05:00