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

102 commits

Author SHA1 Message Date
Daniel A. Wozniak
fc0b20e657 More ssh test fixes 
- Fix thin dir unit tests after distro change revert
- Skip any tests that require system python of 3.9 or higher
 2025-02-19 00:26:32 -07:00
Daniel A. Wozniak
198758a47b Mark test that needs system python 3.8 2025-02-18 18:02:52 -07:00
Pedro Algarvio
3c5b143403
Merge 3006.x into 3007.x 2024-05-14 06:30:18 +01:00
Pedro Algarvio
85ea23dd62 Skip problematic tests due to system python being too recent 2024-05-13 18:31:50 +01:00
ScriptAutomate
457dfa6f23 Add Fedora 40 and Ubuntu 24.04 support 2024-05-13 18:31:50 +01:00
Pedro Algarvio
62bea250ff
Minor timeout adjustments 2024-03-15 14:49:04 +00:00
Pedro Algarvio
03ad4c6337 Update code to be Py3.7+ to reduce merge forward conflicts 2024-02-29 10:16:58 +00:00
Pedro Algarvio
3dea2eb541 Update pre-commit hook versions 2024-02-29 10:16:58 +00:00
Pedro Algarvio
e9122b1d7c Skip salt-ssh related tests on Fedora 39 
The problem is that the tornado we ship is not prepared for Python 3.12,
and it imports `ssl` and checks if the `match_hostname` function is defined, which
has been deprecated since Python 3.7, so, the logic goes into trying to import
backports.ssl-match-hostname which is not installed on the system.
 2024-02-28 11:24:14 +00:00
Pedro Algarvio
0878b59797 Increase timeouts on problematic tests 2024-02-14 01:00:35 -07:00
Pedro Algarvio
f82b214807
Skip tests.integration.cli.test_custom_module on windows. 
These tests were previously skipped because `sshd` was not available.
The newer golden images have `sshd` and this test is just not ready for
windows.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-11-29 05:49:42 +00:00
Pedro Algarvio
4d49013247 Update to isort 5.10.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-08-01 12:49:16 -06:00
MKLeb
2a925cc491 port batch tests and fix returncode logic 2022-02-24 09:36:34 -05:00
Pedro Algarvio
76e50885b0 Fix strings 2021-08-06 13:09:47 -07:00
Pedro Algarvio
6abb43d2df Upgrade to black 21.7b0 2021-08-06 13:09:47 -07:00
Wayne Werner
c8302491d3 Use ? for matching spaces 
Technically this isn't *quite* right as 'CentOSyStream' would also
match, but it's pretty reasonable:

- OS grains shouldn't ever be that kind of close
- This test is only swapping out spaces, and only for the os grain. That
  would mean there would have to be two OSes with grains that only
  differ by one having a space where another one has any other
  character.
- This test really isn't even about matching grains, we're just using
  compound matching and that's a reasonable one to use.
 2021-07-20 07:11:36 -04:00
Pedro Algarvio
75e9655d10 Replace @slowTest with @pytest.mark.slow_test 2021-02-03 06:30:11 +00:00
Pedro Algarvio
e47d5b0bd0 Remove runtests.py and it's supporting code 2021-01-29 13:55:52 -05:00
Pedro Algarvio
55005e4b1d Drop Py2 and six on tests/integration/cli/test_custom_module.py 2021-01-15 07:37:40 +00:00
Pedro Algarvio
4287445c4c Drop Py2 and six on tests/integration/cli/test_batch.py 2021-01-15 07:37:40 +00:00
Pedro Algarvio
bef2edd286 Drop Py2 and six on tests/integration/cli/__init__.py 2021-01-15 07:37:40 +00:00
Pedro Algarvio
a3ddbadb53 Migrate integration.ssh.test_grains and integration.cli.test_grains to PyTest 2021-01-04 19:39:20 +00:00
Pedro Algarvio
c2b702b9b6 Drop Py2 and six on tests/integration/cli/test_grains.py 2020-12-16 15:10:56 +00:00
Pedro Algarvio
02126dc4a5 Just use requires_system_grains 2020-05-21 23:59:36 -07:00
Pedro Algarvio
eac6c03d86 Don't have the sub_minion minion running for all the test session. 
Only where needed.
 2020-05-21 23:59:36 -07:00
Pedro Algarvio
2209c25bf9 Add --run-slow flag to runtests.py 2020-05-07 13:09:02 -07:00
Daniel Wozniak
891f24c641
Merge branch 'master' into port-to-master/50779 2020-04-21 15:00:11 -07:00
Wayne Werner
332f129e90
Skip slowest tests 2020-04-21 11:23:32 -05:00
Pedro Algarvio
60a7547ebd
Fix failing integration.cli.test_grains.GrainsTargetingTest.test_grains_targeting_disconnected 
On the develop branch the last line is not what's being asserted against:
```
['disconnected:',
 '    Minion did not return. [No response]',
 '    The minions may not have all finished running and any remaining minions will return upon completion. To look up the return data for this job later, run the following command:',
 '    ',
 '    salt-run jobs.lookup_jid 20181206232209819226']
```
As opposed to what was expected on 2018.3.x:
```
['disconnected:',
 '    Minion did not return. [No response]']
```
 2020-04-21 12:43:54 +01:00
Pedro Algarvio
6ba04cc7da
Add windows test whitelisting as pytest markers 
Taken out from the pytest migration PR
 2020-04-16 16:57:59 +01:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
Proskurin Kirill
3e0e9289f5
Added tests for cli and runner 2019-09-29 23:57:17 +01:00
Daniel A. Wozniak
4b11d6bb5c
increase batch test timeout on windows 2019-02-14 01:34:01 -07:00
rallytime
b86ad94fb1
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
 2018-11-08 10:44:10 -05:00
rallytime
e993692d01
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - tests/integration/cli/test_batch.py
 2018-11-05 12:54:30 -05:00
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
rallytime
82e73fe49d
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - doc/ref/tops/all/index.rst
  - salt/fileclient.py
  - salt/grains/core.py
  - salt/modules/win_file.py
  - salt/pillar/__init__.py
  - salt/utils/http.py
 2018-10-18 10:41:42 -04:00
Jochen Breuer
7d0b20c91e
Minor fix for def test_batch_run_grains_targeting 
item was never "minion" without a colon, but os_grain was overwritten
anyway. So this fix does not actually affect the test outcome.
 2018-10-05 09:02:15 +02:00
Daniel A. Wozniak
fc39dcf4e4
Simplify cli test fixes 2018-08-30 12:49:41 -07:00
rallytime
4d4922863b
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/runners/cache.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-30 14:39:48 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-08-28 11:22:47 -04:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart 2018-08-27 14:36:40 -07:00
Daniel A. Wozniak
b9c344b7ce
Fix module.archive tests for win py3 2018-08-27 00:44:41 -07:00
Daniel A. Wozniak
5fefd6fe89
Simplify cli test fixes 2018-08-27 00:44:40 -07:00
Daniel A. Wozniak
b8af2387cd
Fix indent wart 2018-08-27 00:44:38 -07:00
Daniel A. Wozniak
2733c02b0a
Use double quotes on windows commands 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
230ad851fd
Fix module.archive tests for win py3 2018-08-27 00:41:30 -07:00
Daniel A. Wozniak
5729ee41ad
Simplify cli test fixes 2018-08-26 20:19:02 -07:00
Daniel A. Wozniak
4b8c916873
Fix indent wart 2018-08-26 02:57:13 -07:00
Daniel A. Wozniak
31472183ec
Use double quotes on windows commands 2018-08-26 00:31:28 -07:00