Commit graph

30566 commits

Author SHA1 Message Date
Gareth J. Greenaway
844563eb23 Update test_mac_keychain.py::test_get_friendly_name to reflect changes. 2023-12-12 15:26:07 -07:00
Gareth J. Greenaway
2cd43087a4 change sysctl setting we use to account for Mac OS X 13. 2023-12-12 15:26:07 -07:00
Gareth J. Greenaway
fc7a66ea88 fixing references to what is returned from salt_call_cli. 2023-12-12 15:26:07 -07:00
Gareth J. Greenaway
0cf94d9bab migrating mac module integration tests to pytest. 2023-12-12 15:26:07 -07:00
jeanluc
33f21b60ca Add tests for issue #65670 2023-12-12 15:25:32 -07:00
nicholasmhughes
aa0f5ccfce fix extfs parameter and retcode handling 2023-12-12 15:22:55 -07:00
jeanluc
be71836da6 Allow accessing the regular mine/event bus from salt-ssh 2023-12-11 20:28:20 -07:00
David Murphy
f694db58a4 Merge pull request #65351 from garethgreenaway/18907_lazy_unmount_when_fails
[master] Add fallback for when "remounting"  NFS or FUSE initially fails
2023-12-11 16:19:38 -07:00
jeanluc
3ee77d8c45 Apply lessons from previous PR 2023-12-11 14:05:22 -07:00
jeanluc
a94ca26c8f Freeze global trust dicts, disallow keyring tests on Win
The test sessions are just timing out on the first keyring test. This
might have to do with two separate GPG instances being requested
simultaneously, but I'm not able to debug this.
2023-12-11 14:05:22 -07:00
jeanluc
f167fe604e Fixes after rebase 2023-12-11 14:05:22 -07:00
jeanluc
4033df82aa Update versionadded 2023-12-11 14:05:22 -07:00
jeanluc
29ab4eaede Merge branch 'gpg-state-fix' into gpg-keyring 2023-12-11 14:05:22 -07:00
jeanluc
72b343182b Add gnupghome/keyring params to trust_key 2023-12-11 14:05:22 -07:00
jeanluc
d7cd698bd9 Add keyring, gnupghome to rest, add functional tests 2023-12-11 14:05:22 -07:00
David Murphy
27f523569d Merge branch 'master' into 18907_lazy_unmount_when_fails 2023-12-10 19:58:35 -07:00
Krzysztof Pawłowski
f5067c1a43 Return error if patch file passed to state file.patch is malformed
If patch file provided for file.patch state is malformed then state
returns `Patch was already applied` but patch is not applied.

          ID: patch_example
    Function: file.patch
        Name: /tmp/example
      Result: True
     Comment: Patch was already applied
     Started: 12:20:50.953163
    Duration: 61.558 ms
     Changes:

It is better to return error in such case.

          ID: patch_example
    Function: file.patch
        Name: /tmp/example
      Result: False
     Comment: /usr/bin/patch: **** malformed patch at line 7:
     Started: 12:33:44.915605
    Duration: 59.202 ms
     Changes:
2023-12-10 15:32:15 -07:00
Konrad Mosoń
ea5a66c612 Cloud/DigitalOcean: Don't throw error when deleting instance, fixes #58190 2023-12-10 15:05:24 -07:00
Daniel A. Wozniak
d09cbc977c Skip unsless test on windows 2023-12-09 15:39:10 -07:00
Daniel A. Wozniak
f41465155d Fix linter 2023-12-08 14:37:53 -07:00
Daniel A. Wozniak
15a24ba9d4 Fix tests 2023-12-08 14:37:53 -07:00
Daniel A. Wozniak
ca8f4dbd50 fix pre commit in tests 2023-12-08 14:37:53 -07:00
Daniel A. Wozniak
79255a17ca Fix key rotation 2023-12-08 14:37:53 -07:00
Daniel A. Wozniak
a4a3c7768d Cluster aes session rotation test 2023-12-08 14:37:53 -07:00
David Murphy
0b2d06e3dd Merge branch '3006.x' into test_coverage_batch_35_slsutil 2023-12-08 11:04:50 -07:00
David Murphy
6d3dce3ac4 Merge branch 'master' into 18907_lazy_unmount_when_fails 2023-12-08 10:43:24 -07:00
David Murphy
f4be8a3198 Merge pull request #65326 from garethgreenaway/65080_require_included_sls
[master] Account for included states that only include other states used as requisites
2023-12-08 10:32:09 -07:00
David Murphy
941b4c4ee5 Merge branch 'master' into 65080_require_included_sls 2023-12-08 08:40:43 -07:00
Daniel Wozniak
ef02a80f11 Merge pull request #65553 from s0undt3ch/hotfix/merge-forward
[master] Merge 3006.x into master
2023-12-07 16:35:19 -07:00
Pedro Algarvio
9ddf3b679d Fix test assertions(broken when migrated to pytest)
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-12-06 20:25:25 +00:00
Pedro Algarvio
43fad97e00 Run pyupgrade against the files modified in the merge-forward 2023-12-05 18:21:45 +00:00
Pedro Algarvio
239207a2b0 Merge 3006.x into master 2023-12-05 18:10:58 +00:00
Daniel A. Wozniak
06200f05c0 Populate __file_client__ for states
Also start using __file_client__ wherever we used to pull a client from
__context__>
2023-12-04 14:20:01 -07:00
Daniel A. Wozniak
e40c33c853 Add master_uri to minion_opts for tests 2023-12-04 14:20:01 -07:00
David Murphy
45c0a003c2 Merge branch '3006.x' into test_coverage_batch_35_slsutil 2023-12-04 13:55:09 -07:00
David Murphy
8cae8348b4 Merge branch 'master' into 65080_require_included_sls 2023-12-04 13:42:31 -07:00
David Murphy
65b84d0892 Merge branch 'master' into 18907_lazy_unmount_when_fails 2023-12-04 13:41:44 -07:00
David Murphy
27974c984c Remove debug logging and add comment for test 2023-11-29 21:40:06 +00:00
David Murphy
3c8c4693ba Fill out lsb_distrib_xxx grains (best guess) if lsb_release information unavailable 2023-11-29 21:40:06 +00:00
Pedro Algarvio
85c986af55 Run pyupgrade against the files modified in the merge-forward 2023-11-29 21:20:41 +00:00
Pedro Algarvio
53acabebdb Merge 3006.x into master 2023-11-29 18:31:52 +00:00
Daniel A. Wozniak
90eb157171 Use get_unused_port utility method 2023-11-29 10:43:44 -07:00
MKLeb
d3a67d5376 run pre-commit 2023-11-29 10:43:44 -07:00
MKLeb
794f4aaa6c Replace localhost with 127.0.0.1 2023-11-29 10:43:44 -07:00
MKLeb
e49d8b326b Swich to ghcr.io/saltstack/salt-ci-containers/tinyproxy:latest container do avoid dockerhub rate limiting 2023-11-29 10:43:44 -07:00
MKLeb
214bb84922 HTTP is now http 2023-11-29 10:43:44 -07:00
MKLeb
647faa20f9 Test against no proxy, GET and POST, and with/without basic auth 2023-11-29 10:43:44 -07:00
MKLeb
ed72ca5185 Add a functional test against a real proxy (tinyproxy) 2023-11-29 10:43:44 -07:00
MKLeb
c6e48703d3 Migrate old unit tests for salt.utils.http to pytest and alter proxy tests to conform to the forced use of requests 2023-11-29 10:43:44 -07:00
Pedro Algarvio
c47995d566 Run pyupgrade against the files modified in the merge-forward 2023-11-29 16:35:43 +00:00