]> git.openstreetmap.org Git - nominatim.git/commitdiff
pytest may also be installed as py-test[-3]
authorSarah Hoffmann <lonvia@denofr.de>
Fri, 15 Jan 2021 15:45:37 +0000 (16:45 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Fri, 15 Jan 2021 16:22:31 +0000 (17:22 +0100)
.github/workflows/ci-tests.yml
CMakeLists.txt
docs/develop/Testing.md

index 99b75f1702b57eff05a3432b592a93ed9383513b..8b20b55d7820a42318d111b9b7d26cba0e0660cc 100644 (file)
@@ -59,7 +59,7 @@ jobs:
               working-directory: test/php
 
             - name: Python unit tests
-              run: pytest test/python
+              run: py.test-3 test/python
 
             - name: BDD tests
               run: behave -DREMOVE_TEMPLATE=1 --format=progress3
index dd73870502a947c62510fbeb57c992b9fd915539..3a9ceed91a66e7e56600d01eef3e23a95395ab29 100644 (file)
@@ -142,7 +142,7 @@ if (BUILD_TESTS)
 
     find_program(PYTHON_BEHAVE behave)
     find_program(PYLINT NAMES pylint3 pylint)
-    find_program(PYTEST pytest)
+    find_program(PYTEST NAMES pytest py.test-3 py.test)
     find_program(PHPCS phpcs)
     find_program(PHPUNIT phpunit)
 
index 6a2becee3052fef4a305e4894de41b356b2d2e63..e2b01b8d6c177a0182f83b6ab0cc56b84c888225 100644 (file)
@@ -49,8 +49,14 @@ to have complete coverage of the Python library in `nominatim`.
 
 To execute the tests run
 
+    py.test-3 test/python
+
+or
+
     pytest test/python
 
+The name of the pytest binary depends on your installation.
+
 ## BDD Functional Tests (`test/bdd`)
 
 Functional tests are written as BDD instructions. For more information on