Commit graph

120667 commits

Author SHA1 Message Date
Erik Johnson
9a04397c11 [3006.x] Clarify that state.apply with no arguments runs a highstate 2024-02-14 14:26:15 -07:00
Shane Lee
62a58e3cca Handle upgrade scenario 2024-02-14 14:24:38 -07:00
Shane Lee
8957046268 Make Photon 3 & 4 tests like Photon 5 2024-02-14 14:24:38 -07:00
Shane Lee
0021cb870d Fix the spec file for RPMs
Looked up the actual code for the macros being replaced
Made sure we're doing the proper if statements
Cleaned up the tests a little
2024-02-14 14:24:38 -07:00
Shane Lee
0917a5abf7 Update pkg upgrade/downgrade tests to check pids 2024-02-14 14:24:38 -07:00
ScriptAutomate
6fa6c86a47 Fix systemd scriptlet calls in RPMs 2024-02-14 14:24:38 -07:00
Pedro Algarvio
68c6fd4fba Increase timeouts on problematic tests 2024-02-14 14:22:06 -07:00
Pedro Algarvio
5fdb598bc4
Run pyupgrade against the files modified in the merge-forward 2024-02-14 08:57:57 +00:00
Pedro Algarvio
fd800f57f1
Merge 3006.x into 3007.x 2024-02-14 08:56:16 +00:00
Erik Johnson
f77d7ea750 Updates to contributing docs
1. Docs reference an EOL version of Python when recommending a version
   to install using pyenv. (resolves #65978)

2. Fixes incorrect location for tests (as described in #66021)
2024-02-14 01:01:45 -07:00
Pedro Algarvio
0878b59797 Increase timeouts on problematic tests 2024-02-14 01:00:35 -07:00
Daniel A. Wozniak
5150b7f726 Fix line endings in auth_v1 test key 2024-02-14 00:49:27 -07:00
Skyler Hawthorne
37587fbd8a skip tests on fips
tests fail on fips enabled platforms due to md5 being disallowed by
default
2024-02-13 21:38:54 +00:00
Skyler Hawthorne
3703fc5291 fix incorrect hash type result in s3fs
The s3fs backend is currently computing the incorrect hash type. The
default hashing algorithm was changed from md5 to sha256. The s3 backend
calls the hashing function without specifying the hash algorithm,
and then hardcodes the result's hash type to md5. After the change to
sha256, this means it was computing a sha256 sum, but saying it was md5.
In turn, it would compute the sha256 sum of the existing target file
and compare it to the cached file's md5, which would obviously always
be different.

This causes downstream effects, such as test mode always reporting a
change, even when there isn't one.

Fixes #65589
2024-02-13 21:38:54 +00:00
Skyler Hawthorne
f25cef6a6c s3fs: downgrade s3fs log listing individual files to debug 2024-02-13 21:38:54 +00:00
Skyler Hawthorne
008a207219 log info line when file in s3 changes 2024-02-13 21:38:54 +00:00
Shane Lee
2b028dc565 Fix issue with stacktrace on CTRL+C 2024-02-13 21:25:48 +00:00
Erik Johnson
aee4cbc53c Change LocalClient -> FSClient
The LocalClient name has been deprecated for some time and now exists
only as an alias.
2024-02-09 16:11:27 +00:00
Erik Johnson
c3cb87adba Don't monkeypatch the fixture contents 2024-02-09 16:11:27 +00:00
Erik Johnson
85130a3d32 Fix tests 2024-02-09 16:11:27 +00:00
Erik Johnson
b223b135f9 Rename test functions to specify that they are testing FSClient
The original draft of these tests was class-based, with the class name
describing that the tests were for FSClient. With the class removed,
this should be in the test name.
2024-02-09 16:11:27 +00:00
Pedro Algarvio
063adf0493 Switch to existing test fixtures 2024-02-09 16:11:27 +00:00
Erik Johnson
f25bbaf744 Move tests to pytests dir and reformat them 2024-02-09 16:11:27 +00:00
Erik Johnson
61f8425d24 _get_defaults can be a staticmethod 2024-02-09 16:11:27 +00:00
Erik Johnson
5e6d23138b Rename test 2024-02-09 16:11:27 +00:00
Erik Johnson
adb9397bd6 Don't needlessly refresh fileserver backends during Pillar rendering
This uses the opts key that masterless runs use to limit fileserver
backend refreshes to a single refresh. Adding it to the master opts
ensures that FSChan instances created on the master do not trigger
fileserver backend refreshes.
2024-02-09 16:11:27 +00:00
Pedro Algarvio
beb2c6d7b4 Some more test timeout updates
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
df6ed810fe Move non functional test to integration tests
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
8b762be8ad Decomplicate the eauth tests
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
5f63d785e9 Switch to a custom timeout_unless_on_windows marker
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
67a0e99bff Increase timeout on some slower tests
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
5d96fdcad2 All tests except tests/pytests/{scenarios,pkg} timeout at 60 seconds
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
022f73aa7c Migrate tests/unit/states/test_pip_state.py::PipStateInstallationErrorTest::test_importable_installation_error to pytest
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Pedro Algarvio
7d6a97e7ba Timeout all unit tests at 60 seconds(if not running on windows)
We have some random test hangs and this will prevent that by forcing the
tests to fail in such cases.
Windows does not take part of this because it does not support
`signal.SIGABRT`, we would have to use threads.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-02-08 21:44:04 +00:00
Shane Lee
4907eb2a8c Use splitlines instead of split 2024-02-07 13:38:49 +00:00
Shane Lee
2a486e6d74 Combine commands in clean key, don't create a variable 2024-02-07 13:38:49 +00:00
Shane Lee
c06ae0a939 Clean the key when it is read 2024-02-07 13:38:49 +00:00
Pedro Algarvio
4cade4f59b
Fix missed salt.ext.tornado occurrence 2024-02-07 12:55:14 +00:00
Pedro Algarvio
4f8f60d89f
Run pyupgrade against the files modified in the merge-forward 2024-02-07 12:47:32 +00:00
Pedro Algarvio
4de6b1011f
Merge 3006.x into 3007.x 2024-02-07 11:09:05 +00:00
Pedro Algarvio
9777612cfd Add changelog for the changes in #65986 2024-02-07 08:58:06 +00:00
Pedro Algarvio
3b24505b3a Remove deprecated code 2024-02-07 08:51:31 +00:00
Pedro Algarvio
bcd236d48c Bump to cryptography==42.0.0 due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f 2024-02-07 01:08:55 -07:00
Erik Johnson
2b364c92e6 Two tweaks for .gitignore
1. `/env/` and `/.env` can be represented in a single entry using `/.?env/`
2. Update `/venv/` entry to also ignore `/.venv/`. Some tools (for
   example poetry) will look for and use virtualenvs in the root of a
   project if they are named `.venv`.
2024-02-06 17:25:47 +00:00
vzhestkov
f35ae268aa Remove unused import causing delays on starting salt-master
(cherry picked from commit 20573c8941)
2024-02-06 06:15:25 +00:00
vzhestkov
6a88baab8c Remove unused import causing delays on starting salt-master
(cherry picked from commit 20573c8941)
2024-02-06 06:15:07 +00:00
vzhestkov
20573c8941 Remove unused import causing delays on starting salt-master 2024-02-06 06:07:30 +00:00
Daniel A. Wozniak
d5b51912a1 Connect master tests need to be coroutines 2024-02-06 05:18:08 +00:00
Daniel A. Wozniak
0568864435 Ensure channels are closed on connection errors 2024-02-06 05:18:08 +00:00
Shane Lee
b1b0c37871 Update function docs 2024-02-03 08:17:49 +00:00