update test scripts

biojppm · Mar 14, 2023 · a3efc99 · a3efc99
1 parent bf2bf3c
commit a3efc99
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 7 deletions.
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -1,5 +1,7 @@
 wheel
-nose
+pytest
+pytest-cov
+parameterized
 twine
 coverage
 codecov

diff --git a/test/run.bat b/test/run.bat
@@ -22,7 +22,7 @@ echo %PIPINSTALL%
 cd test
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
 set PYTHONPATH=%root%\src
-%PYTHON% -m nose -d -v --with-id --nocapture --with-coverage --cover-erase --cover-package=..\src --cover-branches %*
+%PYTHON% -m pytest --cov=..\src --cov-reset %*
 if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%
 
 exit /b %ERRORLEVEL%
diff --git a/test/run.sh b/test/run.sh
@@ -5,14 +5,10 @@ set -e
 
 root=$(cd $(dirname $0)/.. ; pwd)
 PY=${PYTHON:-python3}
-PIP=${PIP:-pip3}
-PIP_INSTALL=${PIP_INSTALL:-pip install}
 
 # run the cmany unit tests
 cd $root/test
 export PYTHONPATH=$root/src
-$PY -m nose -d -v --with-id --nocapture \
-    --with-coverage --cover-erase --cover-package=../src --cover-branches \
-    $*
+$PY -m pytest --cov=../src --cov-reset $*
 
 exit $?
diff --git a/test/test00util.py → test/test_00util.py b/test/test00util.py → test/test_00util.py
diff --git a/test/test01vsinfo.py → test/test_01vsinfo.py b/test/test01vsinfo.py → test/test_01vsinfo.py
diff --git a/test/test02flags.py → test/test_02flags.py b/test/test02flags.py → test/test_02flags.py
diff --git a/test/test03variant.py → test/test_03variant.py b/test/test03variant.py → test/test_03variant.py
diff --git a/test/test04combinations.py → test/test_04combinations.py b/test/test04combinations.py → test/test_04combinations.py
diff --git a/test/test05cmany.py → test/test_05cmany.py b/test/test05cmany.py → test/test_05cmany.py
diff --git a/test/test06xcompile.py → test/test_06xcompile.py b/test/test06xcompile.py → test/test_06xcompile.py
diff --git a/test/test07config.py → test/test_07config.py b/test/test07config.py → test/test_07config.py