Commit graph

41 commits

Author SHA1 Message Date
Pedro Algarvio
f4549113b1
Update pre-commit hook versions 2024-02-29 12:30:49 +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
7a59410c2d MANUALLY STARTING A PATCHER AND NOT STOPPING IT HAS CONSEQUENCES FOR THE WHOLE TEST RUN
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-30 19:43:08 +00:00
Pedro Algarvio
9cf6b752e0 Replace the usage of @skipIf(...)
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2022-12-06 06:03:10 +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
Daniel A. Wozniak
d9b50659b2 Pyupgrade and drop six 2021-07-06 09:04:28 -04:00
Pedro Algarvio
75e9655d10 Replace @slowTest with @pytest.mark.slow_test 2021-02-03 06:30:11 +00:00
Pedro Algarvio
967d26a7fc Replace @destructiveTest with @pytest.mark.destructive_test 2021-02-02 18:19:15 +00:00
Pedro Algarvio
f3d098bb48 Drop Py2 and six on tests/integration/spm/test_repo.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
4770c6559e Drop Py2 and six on tests/integration/spm/test_remove.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
065c4ceb53 Drop Py2 and six on tests/integration/spm/test_install.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
8e38bd3184 Drop Py2 and six on tests/integration/spm/test_info.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
d2768ddf27 Drop Py2 and six on tests/integration/spm/test_files.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
5370ca9dc6 Drop Py2 and six on tests/integration/spm/test_build.py 2021-02-01 10:51:39 +00:00
Pedro Algarvio
ef439b8f4e Fix spm http py3 install 2020-05-11 17:26:56 -07:00
Pedro Algarvio
2209c25bf9 Add --run-slow flag to runtests.py 2020-05-07 13:09:02 -07:00
Wayne Werner
332f129e90
Skip slowest tests 2020-04-21 11:23:32 -05: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
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Erik Johnson
bbfd35d3ea
Replace flaky SPM man test
This replaces a test that has been intermittently failing, and also
expands it to check for _all_ man pages.
2018-03-29 12:19:41 -05:00
rallytime
49e49ae51b
Mark 2 tests as flaky
- integration.spm.test_man_spm.SPMManTest.test_man_spm
- integration.ssh.test_state.SSHStateTest.test_state_running
2018-02-23 09:34:14 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
2018-01-23 13:26:43 -05:00
Daniel Wallace
1f71f301ba
specify checking man page path
Without setting the man path, this would be checking that the installed salt
package used to bootstap has an spm man page, which is possible that it
doesn't, and also not what we want to check
2018-01-19 17:53:20 -07:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/client/ssh/wrapper/state.py
  - salt/modules/yumpkg.py
2018-01-04 17:45:29 -05:00
Nicole Thomas
d0a3770035
Merge pull request #44930 from frogunder/man_spm
man_spm_test
2018-01-04 15:58:01 -05:00
Erik Johnson
f78c71bd6b
[PY3] Add unicode_literals to spm, queues, and rosters 2017-12-28 15:30:27 -06:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
2017-12-21 15:58:08 -05:00
Ch3LL
1bd7110a14
Fix spm big file build test to check /tmp 2017-12-20 14:40:10 -05:00
Frode Gundersen
48e6953e1f
fix_string_error 2017-12-14 22:40:59 +00:00
Frode Gundersen
c9fa4ed2a7
man_spm_test 2017-12-11 19:52:32 +00:00
rallytime
f26beffe48
Update old utils paths to new paths 2017-11-05 20:39:40 -07:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test 2017-10-31 18:18:37 -04:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch 2017-10-27 13:03:01 -04:00
Nicole Thomas
e16707c403 Merge pull request #44285 from Ch3LL/all_spm
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd 2017-10-26 10:09:33 -04:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build 2017-10-25 12:09:51 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test 2017-10-25 12:06:08 -04:00
Ch3LL
4729ccd32b
Add multiple spm integration tests 2017-10-23 17:13:32 -04:00
Ch3LL
1541376c4f
Add spm build test 2017-10-18 17:15:42 -04:00