saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30566 commits 34 branches 292 tags 802 MiB
Commit graph

30566 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Wozniak
3ad04be3d9 Merge pull request #65699 from s0undt3ch/hotfix/merge-forward 
[master] Merge 3006.x into master
 2023-12-15 01:16:58 -07:00
David Murphy
3e7899c3b0 Merge pull request #65407 from garethgreenaway/test_coverage_batch_35_slsutil 
[3006.x] Additional test cases for slsutil
 2023-12-14 13:43:43 -07:00
Pedro Algarvio
f385e4b851 Remove duplicated keyword argument left when conflict solving the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-14 15:09:56 +00:00
Pedro Algarvio
ae52429c47 Remove duplicated function(and pytest helper) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-14 15:08:37 +00:00
Pedro Algarvio
2bfab51bd8 Run pyupgrade against the files modified in the merge-forward 2023-12-14 11:33:55 +00:00
Pedro Algarvio
7d8338b85f Merge 3006.x into 3007.x 2023-12-14 11:32:20 +00:00
David Murphy
12ebb06902 Merge branch '3006.x' into test_coverage_batch_35_slsutil 2023-12-13 09:18:32 -07:00
Frode Gundersen
4807c2536d Update test_glusterfs.py 2023-12-12 15:45:05 -07:00
Frode Gundersen
b9011f3bd0 migrate unit_states_test_glusterfs to pytest 2023-12-12 15:45:05 -07:00
Frode Gundersen
8b05691ec1 Update test_gem.py 2023-12-12 15:44:28 -07:00
Frode Gundersen
acd16ae4c6 migrate unit_states_test_gem to pytest 2023-12-12 15:44:28 -07:00
Frode Gundersen
6092e0b3f1 fix lint error 2023-12-12 15:43:38 -07:00
Frode Gundersen
424f417249 Update tests/pytests/unit/modules/test_dig.py 
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
 2023-12-12 15:43:38 -07:00
Frode Gundersen
a4f19f0919 Update tests/pytests/unit/modules/test_dig.py 
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
 2023-12-12 15:43:38 -07:00
Frode Gundersen
e801dfb684 Update test_dig.py 2023-12-12 15:43:38 -07:00
Frode Gundersen
e193ea42de migrate test_dig to pytest 2023-12-12 15:43:38 -07:00
Frode Gundersen
0cab1ecb12 migrate test_glusterfs to pytest 2023-12-12 15:42:55 -07:00
Frode Gundersen
33a1c54744 migrate test_dpkg_lowpkg to pytest 2023-12-12 15:42:18 -07:00
Frode Gundersen
e1ea50b21d Update test_dnsutil.py 2023-12-12 15:41:43 -07:00
Frode Gundersen
ad1d8ac420 migrate test_dnsutil to pytest 2023-12-12 15:41:43 -07:00
Frode Gundersen
654396f31c skip on Win/Mac 2023-12-12 15:40:52 -07:00
Frode Gundersen
38803cbe13 migrate test_debian_ip to pytest 2023-12-12 15:40:52 -07:00
Frode Gundersen
a0dbff8bbb migrate test_redismod to pytest 2023-12-12 15:40:13 -07:00
Frode Gundersen
c7956484a8 migrate test_serverdensity_device to pytest 2023-12-12 15:37:13 -07:00
Frode Gundersen
c820d48c4d migrate test_servicenow to pytest 2023-12-12 15:36:35 -07:00
Frode Gundersen
c3e3f8aa3b migrate test_smtp to pytest 2023-12-12 15:35:53 -07:00
Frode Gundersen
6acb5509ad migrate test_uwsgi to pytest 2023-12-12 15:35:12 -07:00
Frode Gundersen
6332632ddd fix skip syntax 2023-12-12 15:34:21 -07:00
Frode Gundersen
a8bcef36cb migrate test_xfs to pytest 2023-12-12 15:34:21 -07:00
Frode Gundersen
74ed2e6714 migrate test_xfs to pytest 2023-12-12 15:34:21 -07:00
Frode Gundersen
46191b40c8 fix asserts and fixture names 2023-12-12 15:33:30 -07:00
Frode Gundersen
096fb0df7b migrate test_syslog_ng to pytest 2023-12-12 15:33:30 -07:00
Frode Gundersen
3a3a6ff5d3 use tmp_path and cleanup fixtures 2023-12-12 15:31:27 -07:00
Frode Gundersen
3732acf3bd migrate test_vagrant to pytest 2023-12-12 15:31:27 -07:00
Pedro Algarvio
cf1971850e Simplify the state to run 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
d9299a2498 Don't override the results. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
74c4ea830f Make sure the state tree files created have the right permissions 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
cdec086831 Exitcode 3 just means the service is not running. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
5216486cbf Fix the daemons path on the generated .plist files on MacOS 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
64deea7bbd Define and laydown the state and pillar files only when required for tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
09c082b34f Fail early when failing to extract the version from the packages 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
0bd362a265 Reduce duplication, de-clutter, simplify 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
fde87ee5a3 Remove unused import 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
0a69ad7d1e Remove some duplicate fixtures 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Pedro Algarvio
b092ad5b6e Fix variable name 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-12-12 15:29:41 -07:00
Megan Wilhite
e2f5e5dbbf Migrate package tests to the main test suite 2023-12-12 15:29:41 -07:00
Gareth J. Greenaway
98dce76198 test cleanup, removing nesting, using params. 2023-12-12 15:29:12 -07:00
Gareth J. Greenaway
fe8658758c fixing docstrings. 2023-12-12 15:29:12 -07:00
Gareth J. Greenaway
0518dc06f9 test for the value in the pythonexecutable grain 2023-12-12 15:29:12 -07:00
Gareth J. Greenaway
25acf8b929 more test cases. 2023-12-12 15:29:12 -07:00