Skip to content

Commit e655d0f

Browse files
committedMar 8, 2019
test
1 parent 96bd465 commit e655d0f

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed
 

‎.ci/travis/linux/script.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ docker run -t --name qgis_container \
2727
# commit container
2828
docker commit qgis_container qgis_image
2929

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+
3033
# running QGIS tests in commited image
3134
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
3235

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
3636

3737
declare -A testrunners
3838
# Passing cases:

‎.docker/qgis3-build-deps-cosmic.dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,5 +135,3 @@ ENV CXX=/usr/lib/ccache/clang++
135135
ENV QT_SELECT=5
136136
ENV LANG=C.UTF-8
137137
ENV PATH="/usr/local/bin:${PATH}"
138-
139-
CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

‎.docker/qgis3-build-deps.dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,3 @@ ENV QT_SELECT=5
153153
ENV LANG=C.UTF-8
154154
ENV PATH="/usr/local/bin:${PATH}"
155155

156-
CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

0 commit comments

Comments
 (0)
Please sign in to comment.