From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 28 Sep 2020 02:19:27 +0000 (-0400)
Subject: set pytest rootdir
X-Git-Tag: rel_1_3_20~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3ec1f2d200528d69886a823f9d568ab455f30b6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

set pytest rootdir

With pytest 6.1.0 the root directory calculation logic has
changed and is unreliable on our jenkins setup.   make
sure this is set explicitly.

Change-Id: I1d48b887030c32d2f3361fc36e65e8a988d2ba81
References: https://github.com/pytest-dev/pytest/issues/7807
(cherry picked from commit 7193f94294718159eeabc296812519b30dad67b5)
---

diff --git a/tox.ini b/tox.ini
index a81f64d2e7..084c8c15a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ install_command=python -m pip install {env:TOX_PIP_OPTS:} {opts} {packages}
 usedevelop=
      cov: True
 
-deps=pytest!=3.9.1,!=3.9.2
+deps=pytest>4.6  # this can be 6.x once we are on python 3 only
      pytest-xdist
      mock; python_version < '3.3'
      # needed only for correct profiling results
@@ -56,7 +56,7 @@ setenv=
     PYTHONPATH=
     PYTHONNOUSERSITE=1
     MEMUSAGE=--nomemory
-    BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
+    BASECOMMAND=python -m pytest --rootdir {toxinidir} --log-info=sqlalchemy.testing
 
     WORKERS={env:TOX_WORKERS:-n4  --max-worker-restart=5}
     oracle: WORKERS={env:TOX_WORKERS:-n2  --max-worker-restart=5}