forked from pool/python-pytest-salt-factories
Markéta Machová
959514dedb
- Update to 1.0.0rc27:
* Remove "pytest-tempdir" dependecy as it is now integrated into
pytest-salt-factories.
* Several bug fixes and improvements
- Enable testsuite during package building.
- Fix unit test to work with SUSE/openSUSE Salt 3006.0 package.
- Added:
* fix_unit_tests.patch
OBS-URL: https://build.opensuse.org/request/show/1118071
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-salt-factories?expand=0&rev=3
13 lines
686 B
Diff
13 lines
686 B
Diff
Index: pytest-salt-factories-1.0.0rc27/tests/functional/factories/cli/conftest.py
|
|
===================================================================
|
|
--- pytest-salt-factories-1.0.0rc27.orig/tests/functional/factories/cli/conftest.py
|
|
+++ pytest-salt-factories-1.0.0rc27/tests/functional/factories/cli/conftest.py
|
|
@@ -43,6 +43,5 @@ def salt_proxy_minion(salt_master, proxy
|
|
@pytest.fixture(scope="session")
|
|
def cli_salt_version(salt_version, salt_version_info, salt_version_name):
|
|
_salt_version = f"{salt_version}"
|
|
- if salt_version_info >= (3006, 3):
|
|
- _salt_version += f" ({salt_version_name})"
|
|
+ _salt_version += f" ({salt_version_name})"
|
|
return _salt_version
|