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 4

Bump to pytest-salt-factories==1.0.0rc25

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-07-31 15:21:25 +01:00 • committed by Megan Wilhite
parent 43c7376f69
commit 5f64fbd886
17 changed files with 17 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
requirements/pytest.txt
View file

@ -2,8 +2,7 @@ mock >= 3.0.0
# PyTest
docker
pytest >= 7.2.0
pytest-salt-factories >= 1.0.0rc24
pytest-tempdir >= 2019.10.12
pytest-salt-factories >= 1.0.0rc25
pytest-helpers-namespace >= 2019.1.8
pytest-subtests
pytest-timeout

7
requirements/static/ci/py3.10/darwin.txt
View file

@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -371,10 +371,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -387,7 +383,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.10/freebsd.txt
View file

@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -365,10 +365,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -381,7 +377,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.10/linux.txt
View file

@ -386,7 +386,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -399,10 +399,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -415,7 +411,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-consul==1.1.0
# via -r requirements/static/ci/linux.in

7
requirements/static/ci/py3.10/windows.txt
View file

@ -312,7 +312,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -325,10 +325,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -341,7 +337,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.11/darwin.txt
View file

@ -356,7 +356,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -369,10 +369,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -385,7 +381,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.11/freebsd.txt
View file

@ -350,7 +350,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -363,10 +363,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -379,7 +375,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.11/linux.txt
View file

@ -382,7 +382,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -395,10 +395,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -411,7 +407,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-consul==1.1.0
# via -r requirements/static/ci/linux.in

7
requirements/static/ci/py3.11/windows.txt
View file

@ -310,7 +310,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -323,10 +323,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -339,7 +335,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.8/freebsd.txt
View file

@ -355,7 +355,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -368,10 +368,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -384,7 +380,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.8/linux.txt
View file

@ -390,7 +390,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -403,10 +403,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -419,7 +415,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-consul==1.1.0
# via -r requirements/static/ci/linux.in

7
requirements/static/ci/py3.8/windows.txt
View file

@ -316,7 +316,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -329,10 +329,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -345,7 +341,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.9/darwin.txt
View file

@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -371,10 +371,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -387,7 +383,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.9/freebsd.txt
View file

@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -365,10 +365,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -381,7 +377,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

7
requirements/static/ci/py3.9/linux.txt
View file

@ -388,7 +388,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -401,10 +401,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -417,7 +413,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-consul==1.1.0
# via -r requirements/static/ci/linux.in

7
requirements/static/ci/py3.9/windows.txt
View file

@ -312,7 +312,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.0rc24
pytest-salt-factories==1.0.0rc25
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0
# via pytest-salt-factories
@ -325,10 +325,6 @@ pytest-subtests==0.11.0
# via -r requirements/pytest.txt
pytest-system-statistics==1.0.2
# via pytest-salt-factories
pytest-tempdir==2019.10.12
# via
# -r requirements/pytest.txt
# pytest-salt-factories
pytest-timeout==2.1.0
# via -r requirements/pytest.txt
pytest==7.3.2
@ -341,7 +337,6 @@ pytest==7.3.2
# pytest-skip-markers
# pytest-subtests
# pytest-system-statistics
# pytest-tempdir
# pytest-timeout
python-dateutil==2.8.2
# via

13
tests/conftest.py
View file

@ -67,7 +67,7 @@ else:
os.environ["COVERAGE_PROCESS_START"] = str(COVERAGERC_FILE)
# Define the pytest plugins we rely on
pytest_plugins = ["tempdir", "helpers_namespace"]
pytest_plugins = ["helpers_namespace"]
# Define where not to collect tests from
collect_ignore = ["setup.py"]
@ -112,17 +112,6 @@ logging.root.setLevel(logging.WARNING)
log = logging.getLogger("salt.testsuite")
# ----- PyTest Tempdir Plugin Hooks --------------------------------------------------------------------------------->
def pytest_tempdir_basename():
"""
Return the temporary directory basename for the salt test suite.
"""
return "stsuite"
# <---- PyTest Tempdir Plugin Hooks ----------------------------------------------------------------------------------
# ----- CLI Options Setup ------------------------------------------------------------------------------------------->
def pytest_addoption(parser):
"""