Copy updated test runner into the docker

Handle -e and do not exit on error
qgis · Nov 20, 2018 · ed9709b · 3nids · Mar 5, 2019 · ed9709b
1 parent e8e66d0
commit ed9709b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -35,17 +35,22 @@ if [[ ${DOCKER_BUILD_QGIS_IMAGE} =~ true ]]; then
   popd
 else
   # running QGIS tests
-  #docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
+  docker-compose -f ${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml run --rm qgis-deps
+
   # running tests for the python test runner
-  docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}:/tests/src/python -e DISPLAY=:99 "qgis/qgis:${DOCKER_TAG}"
-  docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_testrunner"
-  [ $? -ne 0 ]   # expected failure
-  docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_testrunner.run_all"
-  [ $? -ne 0 ]   # expected failure
-  docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_testrunner.run_failing"
-  [ $? -ne 0 ]   # expected failure
-  docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_testrunner.run_passing"
-  [ $? -eq 0 ]   # expected pass
-  docker exec -it qgis-testing-environment sh -c "qgis_testrunner.sh test_testrunner.run_skipped_and_passing"
-  [ $? -eq 0 ]   # expected pass
+  docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR}/tests/src/python:/tests_directory -e DISPLAY=:99 "qgis/qgis:${DOCKER_TAG}"
+  sleep 10  # Wait for xvfb to finish starting
+  # Temporary workaround until docker images are built
+  docker cp ${TRAVIS_BUILD_DIR}/.docker/qgis_resources/test_runner/qgis_testrunner.sh qgis-testing-environment:/usr/bin/qgis_testrunner.sh
+  docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh test_testrunner.run_passing"
+  docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh test_testrunner.run_skipped_and_passing"
+  # Failing cases:
+  set +e
+  ret=0 && docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh test_testrunner" || ret=127
+  [ $ret -eq 127 ] || exit 1  # expected failure
+  ret=0 && docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh test_testrunner.run_all" || ret=127
+  [ $ret -eq 127 ] || exit 1  # expected failure
+  ret=0 && docker exec -it qgis-testing-environment sh -c "cd /tests_directory && qgis_testrunner.sh test_testrunner.run_failing" || ret=127
+  [ $ret -eq 127 ] || exit 1  # expected failure
+  set -e
 fi
diff --git a/python/testing/__init__.py b/python/testing/__init__.py
@@ -394,6 +394,11 @@ def start_app(cleanup=True):
     except NameError:
         myGuiFlag = True  # All test will run qgis in gui mode
 
+        try:
+            sys.argv
+        except:
+            sys.argv = ['']
+
         # In python3 we need to convert to a bytes object (or should
         # QgsApplication accept a QString instead of const char* ?)
         try:

diff --git a/tests/src/python/test_testrunner.py b/tests/src/python/test_testrunner.py
@@ -16,12 +16,9 @@
 import qgis  # NOQA
 import sys
 
-from qgis.testing import unittest, start_app
+from qgis.testing import unittest
 from console import console
 from qgis.core import Qgis
-from qgis.PyQt.QtCore import QCoreApplication
-
-start_app()
 
 
 class TestTestRunner(unittest.TestCase):
@@ -57,7 +54,7 @@ def run_failing():
     return _make_runner(['test_fails'])
 
 
-def run_passes():
+def run_passing():
     """Run passing test only"""
     return _make_runner(['test_passes'])