Move tests into the flint module

Author: oscarbenjamin

.github/workflows/buildwheel.yml

@@ -68,29 +68,6 @@ jobs:
         python-version: ['3.9', '3.10', '3.11']
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: wheelhouse
-      - run: pip install --find-links wheelhouse python_flint
-      - run: python test/test.py
-
-  doctest_wheels:
-    needs: build_wheels
-    name: Doctests for ${{ matrix.python-version }} wheel on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, windows-2019, macos-12]
-        python-version: ['3.9', '3.10', '3.11']
-
-    steps:
-      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
@@ -99,7 +76,7 @@ jobs:
           name: artifact
           path: wheelhouse
       - run: pip install --find-links wheelhouse python_flint
-      - run: python test/dtest.py
+      - run: python -m flint.test --verbose
 
   test_pip_linux_vcs:
     name: Install from git checkout on Ubuntu
@@ -110,8 +87,7 @@ jobs:
         with:
           python-version: 3.11
       - run: bin/pip_install_ubuntu.sh . # Install from checkout
-      - run: python test/test.py
-      - run: python test/dtest.py
+      - run: python -m flint.test --verbose
 
   test_pip_linux_pypi:
     name: Install from PyPI sdist on Ubuntu
@@ -123,4 +99,4 @@ jobs:
           python-version: 3.11
       - run: bin/pip_install_ubuntu.sh python-flint # Install from PyPI sdist
       - run: python test/test.py
-      - run: python test/dtest.py
+      - run: python -m flint.test --verbose

.travis.yml

@@ -28,4 +28,4 @@ install:
   - pip install .
 
 script:
-  - python test/test.py
+  - python -m flint.test

bin/cibw.sh

@@ -29,7 +29,7 @@ export CIBW_BEFORE_BUILD_WINDOWS='C:\\msys64\\usr\\bin\\bash bin/cibw_before_bui
 export CIBW_REPAIR_WHEEL_COMMAND_WINDOWS='bin\cibw_repair_wheel_command_windows.bat {dest_dir} {wheel}'
 
 # export CIBW_TEST_COMMAND="python -c 'import flint; print(str(flint.fmpz(2)))'"
-export CIBW_TEST_COMMAND="python {project}/test/test.py && python {project}/test/dtest.py"
+export CIBW_TEST_COMMAND="python -m flint.test"
 
 # cibuildwheel --platform linux
 # cibuildwheel --platform windows

bin/coverage.sh

@@ -33,8 +33,7 @@ export PYTHON_FLINT_COVERAGE=true
 
 python setup.py build_ext --inplace
 
-pytest --cov flint test/test.py
-coverage run --append test/dtest.py
+coverage run -m flint.test $@
 
 #coverage report -m
 coverage html

doc/source/setup.rst

@@ -42,8 +42,7 @@ Then run::
 
 Run the test suite::
 
-    python test/test.py
-    python test/dtest.py
+    python -m flint.test
 
 Build the documentation::
 
@@ -86,8 +85,7 @@ you can then build Python-FLINT in place with::
 
 and run the test suite with::
 
-    python test/test.py
-    python test/dtest.py
+    python -m flint.test
 
 This way of building Python-FLINT depends on the ``bin/activate`` script to
 locate the shared libraries at runtime. The script will also set ``PYTHONPATH``

src/flint/test/__init__.py

@@ -0,0 +1,129 @@
+#
+# Run the python-flint test-suite as
+#
+#    python -m flint.test
+#
+
+import sys
+import doctest
+import traceback
+import argparse
+
+import flint
+from flint.test.test import all_tests
+
+
+def run_tests(verbose=None):
+    """Run all tests
+
+    This is usually called by
+
+        $ python -m flint.flint
+    """
+    # Show the limited output by default
+    if verbose is None:
+        verbose = True
+
+    total = 0
+    failed = 0
+
+    for test in all_tests:
+
+        if verbose:
+            print(f'{test.__name__}...', end='', flush=True)
+
+        try:
+            test()
+        except Exception as e:
+            print(f'Error in {test.__name__}')
+            if verbose:
+                traceback.print_exc()
+            failed += 1
+        else:
+            if verbose:
+                print('OK')
+
+        total += 1
+
+    return failed, total
+
+
+def run_doctests(verbose=None):
+    """Run the python-flint doctests"""
+    # Here verbose=True shows a lot of output.
+    failed, total = doctest.testmod(flint._flint, verbose=verbose)
+    return failed, total
+
+
+def run_all_tests(tests=True, doctests=True, verbose=None):
+
+    success = True
+
+    if tests:
+        print("Running tests...")
+        t_failed, t_total = run_tests(verbose=verbose)
+
+    if doctests:
+        print("Running doctests...")
+        d_failed, d_total = run_doctests(verbose=verbose)
+
+    if tests:
+        if t_failed:
+            print(f'flint.test: {t_failed} of {t_total} tests failed')
+            success = False
+        else:
+            print(f'flint.test: all {t_total} tests passed!')
+
+    if doctests:
+        if d_failed:
+            print(f'flint.test: {d_failed} of {d_total} doctests failed')
+            success = False
+        else:
+            print(f'flint.test: all {d_total} doctests passed!')
+
+    return success
+
+
+def main(*args):
+    """Run the python-flint test-suite"""
+
+    parser = argparse.ArgumentParser(description="Run the python-flint test-suite")
+    parser.add_argument("--quiet", "-q", action="store_true", help="less verbose output")
+    parser.add_argument("--verbose", "-v", action="store_true", help="more verbose output")
+    parser.add_argument("--tests", "-t", action="store_true", help="run tests")
+    parser.add_argument("--doctests", "-d", action="store_true", help="run doctests")
+    args = parser.parse_args(args)
+
+    if not args.tests and not args.doctests:
+        # Default is run all tests:
+        tests = True
+        doctests = True
+    else:
+        # Either --tests or --doctests was specified
+        tests = args.tests
+        doctests = args.doctests
+
+    # Default is show output from tests but keep the doctests quiet.
+    if args.verbose:
+        verbose = True
+    elif args.quiet:
+        verbose = False
+    else:
+        verbose = None
+
+    success = run_all_tests(tests=tests, doctests=doctests, verbose=verbose)
+
+    if not success:
+        print("----------------------------------------")
+        print("!!!FAILED!!!: Something is wrong with your installation of python-flint!")
+        print("----------------------------------------")
+        return 1
+    else:
+        print("----------------------------------------")
+        print("OK: Your installation of python-flint seems to be working just fine!")
+        print("----------------------------------------")
+        return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(*sys.argv[1:]))

src/flint/test/__main__.py

@@ -1558,22 +1558,23 @@ def test_pickling():
         obj2 = pickle.loads(s)
         assert obj == obj2
 
-if __name__ == "__main__":
-    sys.stdout.write("test_pyflint..."); test_pyflint(); print("OK")
-    sys.stdout.write("test_fmpz..."); test_fmpz(); print("OK")
-    sys.stdout.write("test_fmpz_factor..."); test_fmpz_factor(); print("OK")
-    sys.stdout.write("test_fmpz_functions..."); test_fmpz_functions(); print("OK")
-    sys.stdout.write("test_fmpz_poly..."); test_fmpz_poly(); print("OK")
-    sys.stdout.write("test_fmpz_poly_factor..."); test_fmpz_poly_factor(); print("OK")
-    sys.stdout.write("test_fmpz_poly_functions..."); test_fmpz_poly_functions(); print("OK")
-    sys.stdout.write("test_fmpz_mat..."); test_fmpz_mat(); print("OK")
-    sys.stdout.write("test_fmpz_series..."); test_fmpz_series(); print("OK")
-    sys.stdout.write("test_fmpq..."); test_fmpq(); print("OK")
-    sys.stdout.write("test_fmpq_poly..."); test_fmpq_poly(); print("OK")
-    sys.stdout.write("test_fmpq_mat..."); test_fmpq_mat(); print("OK")
-    sys.stdout.write("test_fmpq_series..."); test_fmpq_series(); print("OK")
-    sys.stdout.write("test_nmod..."); test_nmod(); print("OK")
-    sys.stdout.write("test_nmod_poly..."); test_nmod_poly(); print("OK")
-    sys.stdout.write("test_nmod_mat..."); test_nmod_mat(); print("OK")
-    sys.stdout.write("test_arb.."); test_arb(); print("OK")
-    print("OK")
+
+all_tests = [
+    test_pyflint,
+    test_fmpz,
+    test_fmpz_factor,
+    test_fmpz_functions,
+    test_fmpz_poly,
+    test_fmpz_poly_factor,
+    test_fmpz_poly_functions,
+    test_fmpz_mat,
+    test_fmpz_series,
+    test_fmpq,
+    test_fmpq_poly,
+    test_fmpq_mat,
+    test_fmpq_series,
+    test_nmod,
+    test_nmod_poly,
+    test_nmod_mat,
+    test_arb,
+]