diff --git a/.travis/run.sh b/.travis/run.sh index a2618340996..57d3d12ee9d 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -2,16 +2,6 @@ set -e set -x -# If we're running under Python 3.5, we can't use anything but --asert=plain -if [[ $TOXENV = "py35" ]]; then - export TOXARGS="--assert=plain" -fi - -# If we're running under Python 3.6, we can't use anything but --asert=plain -if [[ $TOXENV = "py36" ]]; then - export TOXARGS="--assert=plain" -fi - # We want to create the virtual environment here, but not actually run anything tox --notest diff --git a/tests/conftest.py b/tests/conftest.py index 7ae08ae015a..b9521306800 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -62,7 +62,7 @@ def tmpdir(request): # directory while running the tests. request.addfinalizer(lambda: shutil.rmtree(str(tmp), ignore_errors=True)) - return Path(str(tmp)) + return Path(os.path.realpath(str(tmp))) @pytest.fixture(autouse=True)