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

848 commits

Author SHA1 Message Date
Pedro Algarvio
023bd39eb5
Run pyupgrade against changed files from merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 12:00:37 +01:00
Pedro Algarvio
b85da8d8b0
Merge 3006.x into master 2023-09-26 07:01:03 +01:00
Pedro Algarvio
da7d79a200 Only the /salt mount is important 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
836cd87e08 MariaDB 10.6 was never tested. Removing for the time being. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
8948493f07 Fix the mysql-server container name 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
8702d275ed The 5.5 version of the percona container is no longer available 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
c096bc6022
Run pyupgrade on the files changed on the merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:03:27 +01:00
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04:00
Pedro Algarvio
8f9405cf8e Move download_file helpers to tests/support/pytest/helpers.py 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-30 12:41:10 +01:00
Pedro Algarvio
ae80dcddae Reduce code duplication 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-30 12:41:10 +01:00
Pedro Algarvio
b43c1d9168 Remove vim config comments 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-23 16:28:52 +00:00
Daniel A. Wozniak
673e6ecccb Remove dead code reference 2023-08-21 16:12:01 -07:00
Pedro Algarvio
e8a392577d
Fix merged forwarded code and test 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-17 09:54:54 +01:00
Pedro Algarvio
ad4821b87f
Run pyupgrade on the files changed on the merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-16 09:16:19 +01:00
Daniel A. Wozniak
8190791910 Clean up debugging cruft in test suite 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
8a14947270 More cleanup and test fixes after refactor 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
16fad0baef Add changelog for #64488 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
156e75f345 Clean up 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
4e22161bee Fix warts in TCPPubClient recv 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
7b58472599 Clean-up 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
a2f428e5b3 More test fixes 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
fea99b1335 Fix wart in pub_connect 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
9683260d61 Test fixes 2023-08-08 14:47:15 -07:00
Jenkins
3a4533ee0c Event unit tests 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
e102f8f11e Initial pass at consolidating ipc and tcp/zeromq 2023-08-08 14:47:15 -07:00
Thomas Phipps
021c6792bf fix the runner.run to have its own full_return that defautls to False so anything currently using runner.run will work the same as before. this is what i should have done from the start. 2023-06-27 12:14:57 +01:00
Thomas Phipps
dedade07d7 fix nightlys by mimicing what cli.run does to runner.run output in run_run_plus 2023-06-23 12:39:29 -07:00
Daniel A. Wozniak
4baea1a97b Remove vendored tornado 2023-05-23 14:41:30 -07:00
Jenkins
4c4d017ddb Test fix 2023-05-23 14:41:30 -07:00
Pedro Algarvio
4dd5d53f1f Non onedir builds might be able to user the newer pip and setuptools requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-21 07:51:50 +00:00
Pedro Algarvio
3b31ae4076 Set PYTHONPATH pointing to CODE_ROOT so that tests can run against onedir 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-21 07:51:50 +00:00
Pedro Algarvio
90bca1a7f9 Bump pip and setuptools requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-21 07:51:50 +00:00
Pedro Algarvio
444bdb56f9 Stop using RUNTIME_VARS 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-29 13:02:58 +00:00
Pedro Algarvio
866ded4a30 The TestGitPython*HTTP and TestPygit2*HTTP tests now use a container 
Instead of installing uwsgi and setting up nginx when running the test suite

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-29 09:12:09 +00:00
David Murphy
0bc4a359a6 Removed up debug code 2022-12-20 07:07:21 -07:00
David Murphy
e8441238e1 Initial removal usage of distutils and replacement with setuptools 2022-12-20 07:07:21 -07:00
Pedro Algarvio
79481b72c6
Use the sitecustomize.py provided by pytest-salt-factories. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 19:14:52 +00:00
Pedro Algarvio
3afaeb50bd Skip if the nginx binary cannot be found 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
f0ce8c0b28 The newer Opensuse golden image has git-core in /usr/share 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
7af30ff1bd Replace the usage of @runs_on(...) and @not_runs_on(...) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
c668dcaf5c The minimum PyTest version is now >= 7.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
8a769342d6 Remove tests code/skips targeted for Py<3.6 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-06 06:03:10 +00:00
Pedro Algarvio
1882be04ed change_cwd is not a pytest helper function 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-02 11:19:30 +00:00
Pedro Algarvio
e4c8839cd2 Add group support to the create_account pytest helper 2022-12-02 11:19:30 +00:00
Thomas Phipps
37ad4fac35
Merge branch 'master' into hotfix/payload 2022-09-15 14:40:48 -07:00
Gareth J. Greenaway
998cb0f951 removing versions of mariadb that are no longer supported, adding in 10.6 2022-09-11 10:19:17 +01:00
Pedro Algarvio
3012dc42d6 Test fixes when running with the onedir build 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-29 13:24:21 -07:00
Pedro Algarvio
1ed20998c8 Bump to pytest-salt-factories==1.0.0rc20 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-29 13:23:23 -07:00
Pedro Algarvio
b767b52b16 Migrate tests/integration/modules/test_state_jinja_filters.py to functional 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-26 11:40:34 -07:00
Pedro Algarvio
49c210f70b Migrate tests/integration/states/test_docker_network.py to functional 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-23 12:50:32 -06:00