Restore OREAnalyticsTestSuite.test() and repair the Windows Python test script

ORE-SWIG/runPythonTests.cmd

@@ -1,12 +1,21 @@
-set PYTHONPATH=%PYTHONPATH%;%~dp0\OREAnalytics-SWIG\Python\build;%~dp0\OREAnalytics-SWIG\Python\build\Release
+@echo off
+setlocal
+
+REM Run the Python test suites against a locally built ORE module.
+REM Picks up the setup.py build output; harmless no-op if you installed
+REM the package instead with `python setup.py install`.
+for /d %%d in ("%~dp0build\lib.*") do set "PYTHONPATH=%PYTHONPATH%;%%d"
+
+cd /d "%~dp0test"
+
 echo RUN ORE Python Testsuite
-cd %~dp0\OREAnalytics-SWIG\Python\Test
 python OREAnalyticsTestSuite.py
-pause
+if errorlevel 1 exit /b 1
 
+REM testrunner.py aliases QuantLib to ORE before collection, which the
+REM QuantLib-SWIG tests require; they import QuantLib, not ORE
 echo RUN QuantLib Testsuite
-cd %~dp0\QuantLib-SWIG\Python\test
-python -c "import sys, ORE; sys.modules['QuantLib']=ORE;import QuantLibTestSuite;QuantLibTestSuite.test()"
-pause
+python testrunner.py
+if errorlevel 1 exit /b 1
 
-cd %~dp0\
+echo All Python test suites passed

ORE-SWIG/test/OREAnalyticsTestSuite.py

@@ -7,7 +7,12 @@
 import pytest
 import ORE
 
-if __name__ == '__main__':
+def test():
     print('testing ORED ' + ORE.__version__)
-    sys.exit(pytest.main([os.path.dirname(__file__)]))
+    exit_code = pytest.main([os.path.dirname(os.path.abspath(__file__))])
+    if exit_code != 0:
+        sys.exit(exit_code)
+
 
+if __name__ == '__main__':
+    test()

ORE-SWIG/test/testrunner.py

@@ -5,7 +5,11 @@
 
 sys.modules["QuantLib"] = ORE
 
+QUANTLIB_TESTS = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                              os.pardir, "QuantLib-SWIG", "Python", "test")
+
 if __name__=="__main__":
-    pytest_args = sys.argv[1:] or ["../QuantLibTestSuite"]
+    pytest_args = sys.argv[1:] or [QUANTLIB_TESTS]
     ret_code = pytest.main(pytest_args)
-    print("PyTest Return Code: ", ret_code)
+    print("PyTest Return Code: ", ret_code)
+    sys.exit(ret_code)

ORE-SWIG/tutorials.03.build_windows.md

@@ -92,7 +92,7 @@ setup.py.
     python -m venv env1
     .\env1\Scripts\activate.bat
     python -m pip install --upgrade pip
-    python -m pip install build pynose pytest setuptools
+    python -m pip install build pytest setuptools
     python setup.py wrap
     python setup.py build
     python setup.py test

tutorials/tutorials.030.docker.md

@@ -62,7 +62,7 @@ Invoke the command below to run the docker container interactively:
 Here are the commands to run the examples:
 
     cd /ore/Examples
-    python3 run_examples_testsuite.py --with-xunitmp --xunitmp-file=examples.xml --processes=8 --process-timeout=3600
+    pytest run_examples_testsuite.py --junitxml=examples.xml -n 8 --timeout=3600
 
 Here are the commands to run all of the unit tests in parallel: