Merge pull request #26 from radarhere/fix-travis

Start Xvfb for Trusty and use the service for Xenial
This commit is contained in:
Hugo 2019-01-15 14:01:09 +02:00 committed by GitHub
commit e3795cae89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -31,6 +31,7 @@ matrix:
dist: trusty
- python: "2.7_with_system_site_packages" # For PyQt4
name: "2.7_with_system_site_packages Xenial"
services: xvfb
- python: "2.7_with_system_site_packages" # For PyQt4
name: "2.7_with_system_site_packages Trusty"
dist: trusty
@ -78,7 +79,7 @@ before_install:
before_script:
# Qt needs a display for some of the tests, and it's only run on the system site packages install
- |
if [ "$TRAVIS_PYTHON_VERSION" == "2.7_with_system_site_packages" ]; then
if [ "$TRAVIS_JOB_NAME" == "2.7_with_system_site_packages Trusty" ]; then
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
fi