Commit graph

13 commits

Author SHA1 Message Date
Daniel A. Wozniak
d9b50659b2 Pyupgrade and drop six 2021-07-06 09:04:28 -04:00
Pedro Algarvio
2352457b35 Man pages test does not need to be an integration test 2020-04-29 16:28:47 -07:00
Wayne Werner
332f129e90
Skip slowest tests 2020-04-21 11:23:32 -05:00
Blacken Salt
0b2a5613b3
Blacken salt 2020-04-03 13:05:41 -05:00
ch3ll
33bc5bd840
Merge remote branch 'upstream/master' into mf-master
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/integration/states/test_docker_container.py
  - tests/integration/states/test_ssh_known_hosts.py
  - tests/support/runtests.py
  - tests/unit/modules/test_win_file.py
  - tests/unit/modules/test_zcbuildout.py
  - tests/unit/states/test_zcbuildout.py
2019-12-04 15:50:25 -05:00
Pedro Algarvio
ac0db895ab
Prefer RUNTIME_VARS usage 2019-12-03 15:22:34 +00:00
Pedro Algarvio
7b173523d8
More insight(context) on failure reports 2019-05-08 13:16:34 +01:00
Pedro Algarvio
ec4e101cf9
Merge branch '2018.3' of github.com:saltstack/salt into 2018.3 2019-04-17 18:27:30 +01:00
Pedro Algarvio
0cbed99dc1
Merge branch '2017.7' into 2018.3
Conflicts:
* doc/man/salt.7
* noxfile.py
* salt/client/mixins.py
* salt/cloud/clouds/joyent.py
* salt/daemons/masterapi.py
* salt/master.py
* salt/minion.py
* salt/modules/cassandra_cql.py
* salt/modules/shadow.py
* salt/pillar/git_pillar.py
* salt/returners/cassandra_cql_return.py
* salt/runner.py
* salt/states/pip_state.py
* salt/transport/client.py
* salt/transport/ipc.py
* salt/transport/tcp.py
* salt/utils/asynchronous.py
* salt/utils/event.py
* salt/utils/process.py
* salt/wheel/__init__.py
* tests/integration/cloud/clouds/test_ec2.py
* tests/integration/cloud/clouds/test_joyent.py
* tests/integration/cloud/clouds/test_msazure.py
* tests/integration/cloud/clouds/test_profitbricks.py
* tests/integration/files/file/base/_modules/runtests_helpers.py
* tests/integration/modules/test_pip.py
* tests/integration/states/test_file.py
* tests/integration/states/test_pip_state.py
* tests/support/generate-names-file-from-failed-test-reports.py
* tests/support/parser/__init__.py
* tests/unit/utils/test_asynchronous.py
2019-04-17 17:57:48 +01:00
Pedro Algarvio
0d64bc872b
More insight(context) on failure reports 2019-04-17 16:12:12 +01:00
David Murphy
880375c4fc Initial updated ssh tests for AIX support 2019-04-16 15:18:38 -06:00
rallytime
4ad50bbdee
Update old utils paths to new paths 2018-04-03 14:46:56 -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