Commit graph

108925 commits

Author SHA1 Message Date
Bryce Larson
d74b4008fc update amis 2020-09-04 09:20:24 -07:00
Daniel A. Wozniak
e92eda71e9 Fix dependencies link in readme 2020-09-03 17:25:46 -07:00
Daniel A. Wozniak
fb6f6a7947 Add attributions and dependencies file 2020-09-03 17:18:40 -07:00
Jasper Lievisse Adriaanse
cc8e8df60e Drop manpage modification. 2020-09-03 13:30:25 -07:00
Jasper Lievisse Adriaanse
7b2b36f823 Fix versionadded in style guide
The provided sample code incorrectly uses 'versionadded' in this
instance.
2020-09-03 13:30:25 -07:00
Pedro Algarvio
79fe0a8bb3
Merge pull request #58366 from s0undt3ch/hotfix/pytest-migration-1
[PyTest Migration] PyTest Fixes
2020-09-03 11:32:22 +01:00
Pedro Algarvio
9e785ce9a6
The virt minions should be using the salt master transport 2020-09-03 09:53:50 +01:00
Pedro Algarvio
0b99eaab0f
Bump pytest-salt-factories to 0.11.4 2020-09-03 09:53:44 +01:00
Pedro Algarvio
ef35eecbd4
Merge pull request #58356 from s0undt3ch/hotfix/pytest-migration-1
[PyTest Migration] PyTest Fixes/Cleanup before migration
2020-09-02 13:58:24 +01:00
Pedro Algarvio
fe66dd67f9
Bump PyTest to 6.0.1 2020-09-02 12:34:06 +01:00
Pedro Algarvio
20d515cc43
Skip tests which did not run before migrating to PyTest
These tests only ran under CentOS and Ubuntu.
2020-09-02 12:34:06 +01:00
Pedro Algarvio
5804ce3c47
Drop our custom mark evaluator
Refs https://github.com/pytest-dev/pytest/pull/7695
2020-09-02 12:34:06 +01:00
Pedro Algarvio
47280a542b
Less intrusive control over package scoped fixtures 2020-09-02 12:34:06 +01:00
Pedro Algarvio
569a99cf46
Never mix unittest and pytest tests 2020-09-02 12:34:05 +01:00
Pedro Algarvio
43b23f7744
Fix windows unit test white listing under PyTest 2020-09-02 12:34:05 +01:00
Pedro Algarvio
d9091b48b8
Import the pytest fixtures on the "main" conftest.py 2020-09-02 12:34:05 +01:00
Pedro Algarvio
c06f77dd2b
Bump pytest-salt-factories to 0.11.x 2020-09-02 12:34:05 +01:00
Pedro Algarvio
61877627eb
Merge pull request #58358 from s0undt3ch/hotfix/requirements
Don't install setuptools >= 50.0.0 until they release something useful
2020-09-01 20:55:24 +01:00
Pedro Algarvio
de833885d4
Don't install setuptools >= 50.0.0 until they release something useful
https://github.com/pypa/setuptools/issues/2352#issuecomment-685046897
2020-09-01 19:41:12 +01:00
Pedro Algarvio
a53bac0a6b
Merge pull request #58351 from s0undt3ch/hotfix/bad-tests-1
Don't use the same service, we might get throttled and the test fails.
2020-09-01 16:40:25 +01:00
Pedro Algarvio
e84a947fc2
Merge pull request #58349 from s0undt3ch/hotfix/requirements
Never use setuptools==50.0.0. Followup to 87c94b3490
2020-09-01 14:48:51 +01:00
Pedro Algarvio
d495d2c61e
Don't use the same service, we might get throttled and the test fails. 2020-09-01 14:38:19 +01:00
Pedro Algarvio
aff1ce6e37
Merge pull request #58350 from s0undt3ch/hotfix/black-master
Revert "Bump black to version 20.8b1"
2020-09-01 11:15:14 +01:00
Pedro Algarvio
fe2b02ac7c
Revert "Bump black to version 20.8b1"
This reverts commit e22fa636f5.
2020-09-01 10:31:14 +01:00
Pedro Algarvio
738ca360bf
Never use setuptools==50.0.0. Followup to 87c94b3490 2020-09-01 07:55:53 +01:00
Pedro Algarvio
b7f6fcab5b
Merge pull request #58337 from s0undt3ch/hotfix/requirements
Downgrade setuptools to < 50.0.0
2020-09-01 00:21:20 +01:00
Pedro Algarvio
cd9a439ce5 Bump black to version 20.8b1 2020-08-31 13:34:59 -07:00
Dmitry Kuzmenko
a522bcfdaf Fixes for issues found by tests. 2020-08-31 13:34:25 -07:00
Dmitry Kuzmenko
af185d74eb Ran pre-commit hook 2020-08-31 13:34:25 -07:00
Dmitry Kuzmenko
3c86a5a9ca Daemons wrongly set six.string_types to (str, bytes)
... that takes permanent effect.
2020-08-31 13:34:25 -07:00
Pedro Algarvio
87c94b3490
Never use setuptools==50.0.0 2020-08-31 19:37:20 +01:00
Jasper Lievisse Adriaanse
6170eac439 Sync OpenBSD installation documentation with reality
OpenBSD's salt package moved to python3 a while ago and dependencies
have changed since this page was last updated.

While here tweak a reference to the OpenBSD package, not pkg, repo.
2020-08-28 12:16:13 -07:00
Bryce Larson
2d684bd506 hard-code ami ids 2020-08-28 11:03:45 -07:00
krionbsd
3332f5e131 [merge jam] port 53224 2020-08-27 13:04:37 -07:00
Nicholas Hughes
4fef467b64
Adding nftables functionality for use in EL8 (#56259)
* adding nftables functionality for use in EL8

* default to current functionality

* updates for black

* updates for black

* updates for black

* Update test_nftables.py

* updates for black

* updates for black

* updates for black

* updates for black

* updates for black

* updates for black

* fix spacing for test comment returns to match state

* changed versionadded, black, and lint due to time-travelling PR

* fixing test lint failure

* more lint fixes

Co-authored-by: Sage the Rage <36676171+sagetherage@users.noreply.github.com>
2020-08-27 09:59:36 -07:00
krionbsd
737e3e0215 Fix broken slowtest on FreeBSD 2020-08-27 09:57:36 -07:00
Bryce Larson
44f3649bee add freebsd pipelines 2020-08-27 09:57:36 -07:00
Pedro Algarvio
252a934448
Merge pull request #58293 from s0undt3ch/hotfix/pytest-migration-1
[PyTest Migration] Minor fixes & Improvements to PyTest runs
2020-08-26 20:38:54 +01:00
Pedro Algarvio
364828f7e3
Merge pull request #58295 from krionbsd/gecos_fbsd
Fix broken slow test on FreeBSD
2020-08-26 20:38:15 +01:00
Pedro Algarvio
6ae51017ea
Merge pull request #58292 from krionbsd/increatefbsd
Skip beacon test on FreeBSD
2020-08-26 20:36:40 +01:00
Pedro Algarvio
97a1390a9c
Update salt-factories compat to latest 2020-08-26 18:09:16 +01:00
Pedro Algarvio
9d8745162a
We can't just change module attributes while testing. Use mock.patch. 2020-08-26 18:09:16 +01:00
Pedro Algarvio
f7f5ad70dd
There are other sleeps involved when running under pytest 2020-08-26 18:09:15 +01:00
Pedro Algarvio
705c015736
Move get_virtualenv_binary_path to tests.support.helpers 2020-08-26 18:09:15 +01:00
Pedro Algarvio
dff88decfe
Show local variables on test failures 2020-08-26 18:09:15 +01:00
krionbsd
7701f97233 Fix broken slow test on FreeBSD 2020-08-26 19:06:02 +02:00
Pedro Algarvio
ad6eee068a
Merge pull request #58290 from krionbsd/zopefbsd
Fix broken slow test on FreeBSD
2020-08-26 17:28:06 +01:00
krionbsd
7b9ef2abb0 Skip beacon test on FreeBSD 2020-08-26 18:13:51 +02:00
Pedro Algarvio
328e1efa35
Merge pull request #58287 from Ch3LL/ssh_netapi
do not del roster_file from opts for ssh netapi
2020-08-26 16:53:13 +01:00
Pedro Algarvio
f2ad802339
Merge pull request #58288 from s0undt3ch/hotfix/bad-tests-3
Fix macOS service test failure
2020-08-26 16:46:05 +01:00