File tree Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Expand file tree Collapse file tree 3 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -27,12 +27,12 @@ docker run -t --name qgis_container \
27
27
# commit container
28
28
docker commit qgis_container qgis_image
29
29
30
+ # running tests for the python test runner
31
+ docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR} /tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image " /usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
32
+
30
33
# running QGIS tests in commited image
31
34
docker-compose -f ${TRAVIS_BUILD_DIR} /.ci/travis/linux/docker-compose.travis.yml run qgis-deps /root/QGIS/.ci/travis/linux/scripts/docker-qgis-test.sh
32
35
33
- # running tests for the python test runner
34
- docker run -d --name qgis-testing-environment -v ${TRAVIS_BUILD_DIR} /tests/src/python:/tests_directory -e DISPLAY=:99 qgis_image " /usr/bin/supervisord -c /etc/supervisor/supervisord.conf"
35
- sleep 10 # Wait for xvfb to finish starting
36
36
37
37
declare -A testrunners
38
38
# Passing cases:
Original file line number Diff line number Diff line change @@ -135,5 +135,3 @@ ENV CXX=/usr/lib/ccache/clang++
135
135
ENV QT_SELECT=5
136
136
ENV LANG=C.UTF-8
137
137
ENV PATH="/usr/local/bin:${PATH}"
138
-
139
- CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change @@ -153,4 +153,3 @@ ENV QT_SELECT=5
153
153
ENV LANG=C.UTF-8
154
154
ENV PATH="/usr/local/bin:${PATH}"
155
155
156
- CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
You can’t perform that action at this time.
0 commit comments