[MAINT] various test updates (#1334)

joblib · Sep 14, 2022 · ac09691 · ac09691
1 parent 4a314b1
commit ac09691
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh
@@ -12,9 +12,7 @@ set -e
 
 create_new_conda_env() {
     conda update --yes conda
-    # TODO: unpin pytest once it no longer causes test errors because of
-    # PytestRemovedIn8Warning warnings
-    TO_INSTALL="python=$PYTHON_VERSION pip pytest<7.0 $EXTRA_CONDA_PACKAGES"
+    TO_INSTALL="python=$PYTHON_VERSION pip pytest $EXTRA_CONDA_PACKAGES"
     conda create -n testenv --yes -c conda-forge $TO_INSTALL
     source activate testenv
 }
@@ -25,9 +23,7 @@ create_new_pypy3_env() {
     tar xvf $PYPY_FOLDER.tar.bz2
     $PYPY_FOLDER/bin/pypy3 -m venv pypy3
     source pypy3/bin/activate
-    # TODO: unpin pytest once it no longer causes test errors because of
-    # PytestRemovedIn8Warning warnings
-    pip install -U pip 'pytest<7.0'
+    pip install -U pip 'pytest'
 }
 
 if [[ "$PYTHON_VERSION" == "pypy3" ]]; then
@@ -51,10 +47,7 @@ if [ -n "$NUMPY_VERSION" ]; then
 fi
 
 if [[ "$COVERAGE" == "true" ]]; then
-    # TODO: unpin when https://github.com/nedbat/coveragepy/issues/883 is fixed
-    # Weird issues with recent version of coverage: unpin when not causing
-    # pytest to raise INTERNALERROR exceptions.
-    PIP_INSTALL_PACKAGES="$PIP_INSTALL_PACKAGES coverage==4.5.4 pytest-cov codecov"
+    PIP_INSTALL_PACKAGES="$PIP_INSTALL_PACKAGES coverage pytest-cov codecov"
 fi
 
 if [[ "pypy3" != *"$PYTHON_VERSION"* ]]; then

diff --git a/joblib/test/test_memmapping.py b/joblib/test/test_memmapping.py
@@ -839,7 +839,7 @@ def get_temp_folder(parallel_obj, backend):
                 # the temporary folder should be deleted by the end of this
                 # call but apparently on some file systems, this takes
                 # some time to be visible.
-                for i in range(10):
+                for i in range(100):
                     if not os.path.exists(temp_folder):
                         break
                     sleep(.1)