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

2910 commits

Author SHA1 Message Date
Pedro Algarvio
2702705043
Merge 3006.x into master 2023-09-29 18:15:30 +01:00
Pedro Algarvio
686f1d2fa9 Try a few times before raising the error 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:12:59 +01:00
Pedro Algarvio
b44f80163a Reduce the swarm minions count 
Newer coverage library versions consume more memory and this will avoid
consuming it all and not finishing the test suite.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:12:59 +01:00
jeanluc
f79cee6075 Remove new err msg again. Report state ID, not module 2023-09-27 12:38:48 +00:00
jeanluc
a35e60dd72 Fix new reactor test after rebase 2023-09-27 12:38:48 +00:00
jeanluc
93859b1e6c Improve error message with multiple string-valued state args 2023-09-27 12:38:48 +00:00
Pedro Algarvio
6d0224f08c
Also install tornado before starting Salt 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 21:44:31 +01:00
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
74b75fc109 Skip tests which are only meant to work on x86_64 platforms 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
676a3f39cf Assert against the return code of the executed commands 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
31f50159a6 Use the salt release images from the salt-ci-containers repository 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
2ccf2401dc Different subnet to avoid the tests getting skipped 
```
Failed to create docker network: {
  'name': 'salt-performance',
  'changes': {},
  'result': False,
  'comment': "Failed to create network 'salt-performance': Error 403: Pool overlaps with other one on this address space"
}
```

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
6fc622ffdd
Run pyupgrade against changed files from merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:58:54 +01:00
Pedro Algarvio
5e093b3b8d
Merge 3006.x into master 2023-09-25 11:41:20 +01:00
Pedro Algarvio
519666b0cf Set cgroupns to host to fix the libvirt migration tests. 
This needs a newer version of the python docker package.

The breakage was due to updating the docker container used. - https://github.com/saltstack/salt-ci-containers/pull/42

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
9fb51b083a Bump to docker==6.1.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
f334749c5f
Merge 3006.x into master 2023-09-21 20:41:31 +01:00
nicholasmhughes
8fbb5d3a26 remove permission check as its probably an unreachable edge case 2023-09-21 10:40:58 -07:00
nicholasmhughes
b19682a297 root can still read the file and tests run as root 2023-09-21 10:40:58 -07:00
nicholasmhughes
165621c166 add negative tests for _getgrall 2023-09-21 10:40:58 -07:00
nicholasmhughes
0af4490c0f add tests for _getgrall and local vs remote group handling 2023-09-21 10:40:58 -07:00
Pedro Algarvio
c07f66261e
Merge 3006.x into master 2023-09-20 15:52:18 +01:00
Pedro Algarvio
7fdd867d61
Merge pull request #65160 from MKLeb/mf/master/3006.x 
[master] Merge forward 3006.x into master
 2023-09-20 11:03:13 +01:00
Joseph Hall
39107095dd Skip vim test for Photon 2023-09-19 18:32:53 +00:00
Joseph Hall
1ec162e946 Check for errors before result loop 2023-09-19 18:32:53 +00:00
Joseph Hall
845853c1bd Assert specifically against True 2023-09-19 18:32:53 +00:00
Joseph Hall
94f233cefa Formula tests for vim and sudoers 2023-09-19 18:32:53 +00:00
Megan Wilhite
916ac22796 Fix pr feedback 2023-09-18 19:05:30 +01:00
Megan Wilhite
d63fe0a296 Add unit tests and fix clean error when id is not string 2023-09-18 19:05:30 +01:00
Megan Wilhite
778009e587 Increase code coverage for salt/state.py 2023-09-18 19:05:30 +01:00
MKLeb
88c0c5a33b Only run __create_keys_dir if we have a --gen-keys argument 2023-09-17 13:03:38 +01:00
Pedro Algarvio
685ca05b62
Move test to the right test module 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-14 18:57:28 +01:00
Pedro Algarvio
910c78d4e0
Switch to the correct fixture usage 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-14 18:57:28 +01:00
Pedro Algarvio
d0f05e0558
Fix failing tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-14 18:57:28 +01:00
Joseph Hall
c5936f92ae Assert against True, not unspecified 2023-09-14 17:20:57 +00:00
Joseph Hall
e3c428e61b Correct failure assertion 2023-09-14 17:20:57 +00:00
Gareth J. Greenaway
f2511ff711 Ensure kwargs are sent along correctly to multiple sub proxies. 2023-09-14 12:41:38 +00:00
Pedro Algarvio
f389c29473
Merge 3006.x into master 
Conflicts:
 * requirements/darwin.txt
 * requirements/pytest.txt
 * requirements/static/ci/common.in
 * requirements/static/ci/darwin.in
 * requirements/static/ci/freebsd.in
 * requirements/static/ci/linux.in
 * requirements/static/ci/py3.10/cloud.txt
 * requirements/static/ci/py3.10/darwin.txt
 * requirements/static/ci/py3.10/freebsd.txt
 * requirements/static/ci/py3.10/lint.txt
 * requirements/static/ci/py3.10/linux.txt
 * requirements/static/ci/py3.10/windows.txt
 * requirements/static/ci/py3.11/windows.txt
 * requirements/static/ci/py3.7/cloud.txt
 * requirements/static/ci/py3.7/freebsd.txt
 * requirements/static/ci/py3.7/lint.txt
 * requirements/static/ci/py3.7/linux.txt
 * requirements/static/ci/py3.8/cloud.txt
 * requirements/static/ci/py3.8/freebsd.txt
 * requirements/static/ci/py3.8/lint.txt
 * requirements/static/ci/py3.8/linux.txt
 * requirements/static/ci/py3.8/windows.txt
 * requirements/static/ci/py3.9/cloud.txt
 * requirements/static/ci/py3.9/darwin.txt
 * requirements/static/ci/py3.9/freebsd.txt
 * requirements/static/ci/py3.9/lint.txt
 * requirements/static/ci/py3.9/linux.txt
 * requirements/static/ci/py3.9/windows.txt
 * requirements/static/pkg/freebsd.in
 * requirements/static/pkg/linux.in
 * requirements/static/pkg/py3.10/darwin.txt
 * requirements/static/pkg/py3.10/windows.txt
 * requirements/static/pkg/py3.11/windows.txt
 * requirements/static/pkg/py3.8/windows.txt
 * requirements/static/pkg/py3.9/darwin.txt
 * requirements/static/pkg/py3.9/windows.txt
 * requirements/windows.txt
 2023-09-13 16:09:29 +01:00
Pedro Algarvio
353b1d48b9
Fix(adjust) failing test due to changes in the master branch not in 3006.x 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-13 15:28:26 +01:00
Pedro Algarvio
31068bc174
Remove unneeded kwarg which also adds confusion 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-13 13:52:14 +01:00
cmcmarrow
dd511289d1 move lock 2023-09-12 19:57:04 +00:00
Thomas Phipps
2475f4fd14 rpm doenst need to check digest and signing when listing packages 2023-09-12 10:16:55 -07:00
MKLeb
da9e410c81 Fix pkg.latest for winrepo packages where the package is already up to date 2023-09-12 10:15:31 -07:00
Pedro Algarvio
c854acb3ee
The correct method is assert_called_once_with not called_once_with 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:08:23 +01:00
Pedro Algarvio
628592f22b
The RequestClient class no longer defines the message_client attribute 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:03:27 +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
Pedro Algarvio
2d46e659f4
Salt no longer vendors tornado 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 13:03:27 +01:00
jeanluc
4bc5a4deb8 Add tests for issue 64597 2023-09-11 13:19:16 +01:00
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04:00