Commit graph

119156 commits

Author SHA1 Message Date
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
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
vzhestkov
6a88baab8c Remove unused import causing delays on starting salt-master
(cherry picked from commit 20573c8941)
2024-02-06 06:15:07 +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
Shane Lee
da2bf5ccd4 Only catch error when value not found 2024-02-03 08:17:49 +00:00
Shane Lee
2368341eca Fix mac_shadow module
Fixes an issue with the mac_shadow module where it would fail to
retrieve values that weren't set yet... last login for example.
Also adds some tests and a changelog
2024-02-03 08:17:49 +00:00
Shane Lee
4157fe7ed0 Add changelog 2024-02-01 20:11:34 +00:00
Shane Lee
6645801eee Add some tests 2024-02-01 20:11:34 +00:00
Shane Lee
e4a62fe2d5 Find libcrypto.dylib in macos
Find libcrypto in non-relenv installations where Salt is installed using
pip. For example: `pip install -e .`
2024-02-01 20:11:34 +00:00
Søren Louv-Jansen
7413cdfcc0 Update backport action
Backport action was moved from 

https://github.com/sqren/backport-github-action

to 

https://github.com/sorenlouv/backport-github-action
2024-02-01 11:44:33 +00:00
Pedro Algarvio
ec3ea35954
Merge pull request #65969 from s0undt3ch/hotfix/merge-forward-into-3006.x
[3006.x] Merge 3006.6 into 3006.x
2024-02-01 07:21:57 +00:00
Pedro Algarvio
ede09ef43e
Fix pre-commit 2024-01-31 21:12:34 +00:00
Pedro Algarvio
0d7512b824 Release v3006.6
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEEIV//dP5Hq5XeiHWZMu8gXPXaz8FAmW6s70ACgkQZMu8gXPX
 az86nQv+NgLecuQ+zUa+YQzK8zCAXS0pHzqVjNmRSbdYr91aUtQhHSmlH9LAi+YK
 tDa9C7eVD3PNVstxD9DBFP/uVDY20Lls78GgcuE+BLsTe1LHX+YARCy2cZmZq5ft
 CzdAyty0pcwGmJA9aeOYD04bdL9Ffq7xALt/jK7/iuFFAvx99SUAfoqgIA4d+5DX
 sJpA33mApRaQ0TMUszMjyDeMfvD8b0X8VR3VMGvtFLadvP+ha4PAX8TaBnFbBcEJ
 mhUNYuOIpvm+nfXCACZNQe++4XSshpnNUDUjQ/y7cCG1ijioxBz9GdFu63wjTLNz
 ZEkaH18HDTlYQx0fJEK1HIDEyxiEa8Xu+Dw1cJdyZia5oGyoc6jNMYFmc0OnF/8W
 EaqlzIazTqx+puMWThbQp3sytTXhcCjb3qhlndujhrscdfk9dWdaS0Mji4CVNkHy
 ZMH16VOmuh//muBi8C1mDClv2ayrBSK5oWxNm8j5T+8+pgvBdDM6iFSA4O6U0juT
 vY+U7xnD
 =HOve
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0pCPs6gjsPqzvSH1uza/ZYSimP8FAmW6tKAACgkQuza/ZYSi
 mP86DA//ROPz8A5OYtsJEZoPbzUqE3w3iIK6udcIn5lgw6GfCQ2n5AzRU3jecNNB
 caDkYHKz5p4yRdoqHiGEpU5Y12R28EP7IdDnYMqOskZwubrwnxzqxHJh3scGpVQ7
 VPDNAhtAn6lcHtq07Al2YPCaCk3iGZjABz251H7qWcWQcv0nyWGQnYYpBlOJTzk6
 gA5G/TJfZDPw2cdBQqcL9p2Dq9POED08DcuX7q6FR46hxYTpijg/0sL+Y+t2HMr5
 bZePEiigEkbnlJ6ssoQ9aCvUBz6E1sCNy4pfXc0IVx+j7x67gldpK5+ByGcMHiOj
 S1tXqQzTnaLpUcepfUD5Qe1VPjfuk94QUF8UdicJ8u72iTkQKM2n9IYeybDxmoj9
 iKrhw0fxOLd5afwzy8/NqLXHSH6sfqpRHKcOAwyg4L0aOZqdlsjFNxp9TMN6xami
 XRlLLSqWDCvsSzw5btbYJ20zjv+TGsleDyFkJMDkeQlr/oCcWza8cakq5JnHX38y
 rEDm5tMTcxX/GOGf3qexePU4Ca8tGkdKuss/QlBeuRSH0djzqtUrEjcQJAu14C/3
 nY5F5Z6vgmwSK5l+wnH3cEx9fDqryPRFJCygaQ5yhl1nSpDtzRuDkYYgbU0JOYxA
 cBJQrKndI/sezDC2T6rmS+buVGLTQasAXvOIg3UGw6ynG95LZ7I=
 =PsFs
 -----END PGP SIGNATURE-----

Merge upstream 3006.6 into 3006.x
2024-01-31 20:59:12 +00:00
Pedro Algarvio
3746ae8994
Merge upstream 3006.x into 3006.x 2024-01-31 19:37:12 +00:00
Daniel A. Wozniak
4b170454e9 Force arm64 not aarch64 2024-01-31 12:35:50 -07:00
Daniel A. Wozniak
8c5b8518df Fix onedir download step 2024-01-31 12:15:58 -07:00
Pedro Algarvio
c1d2c0833b
Merge 3005.x into 3006.x 2024-01-31 18:19:51 +00:00
Pedro Algarvio
297e2003b1
Merge 3005.x into 3006.x 2024-01-31 18:01:15 +00:00
Pedro Algarvio
232856613b
Merge 3005.5 into 3005.x 2024-01-31 17:54:54 +00:00
Shane Lee
bba2f6672b Add changelog 2024-01-31 16:47:04 +00:00
Shane Lee
c8749f32b7 Parametrize the test 2024-01-31 16:47:04 +00:00
Shane Lee
2e8e32eebe Add simple test for _clean_key 2024-01-31 16:47:04 +00:00
Shane Lee
278d2f1bac Make _clean_key a static method 2024-01-31 16:47:04 +00:00
Shane Lee
243f921147 Remove line ending before comparison 2024-01-31 16:47:04 +00:00
Pedro Algarvio
2e5c42174a A change in .github/workflows/build-deps-ci-action.yml invalidates cache 2024-01-31 16:12:23 +00:00
Pedro Algarvio
09fb884286 Build documentation when .github/workflows/build-docs.yml changes 2024-01-31 13:23:13 +00:00
Pedro Algarvio
3dc0a2ca30 Fix the copy path 2024-01-31 13:23:13 +00:00
Max Arnold
a14e899ffb Use the "features" option directly, add test 2024-01-31 13:18:22 +00:00
Max Arnold
4769ae0236 Address the code review comments 2024-01-31 13:18:22 +00:00
Max Arnold
94047ee596 Add changelog entry 2024-01-31 13:18:22 +00:00