* fix pytest config in different python version

harvester · Nov 27, 2023 · 4a9324a · 4a9324a
1 parent dcc6f30
commit 4a9324a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/py36_pytest.ini b/py36_pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+render_collapsed = True
diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,7 @@ deps = pytest
 commands =
   {toxinidir}/terraform_test_artifacts/terraform_install.sh
   find . -type f -name "*.pyc" -delete
-  pytest {posargs}
+  pytest -c {env:PYTEST_CONFIG:{toxinidir}/tox.ini} {posargs}
 allowlist_externals = {toxinidir}/*,bash,find
 passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VERSION
 
@@ -28,3 +28,7 @@ max-line-length = 99
 
 [pytest]
 render_collapsed = all
+
+[testenv:py36]
+setenv =
+    PYTEST_CONFIG = {toxinidir}/py36_pytest.ini