From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 15 Jan 2021 15:45:37 +0000 (+0100)
Subject: pytest may also be installed as py-test[-3]
X-Git-Tag: v3.7.0~55^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e8cfba1b10206ac4b49172caf8667f12f28b2d40

pytest may also be installed as py-test[-3]
---

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 99b75f17..8b20b55d 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd738705..3a9ceed9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 
diff --git a/docs/develop/Testing.md b/docs/develop/Testing.md
index 6a2becee..e2b01b8d 100644
--- a/docs/develop/Testing.md
+++ b/docs/develop/Testing.md
@@ -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