Deluge
diff options
| author | bendikro <bro.devel+deluge@gmail.com> | 2015-07-15 22:17:36 +0200 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2015-08-14 16:45:23 +0100 |
| commit | 379ba33bb9feca6d47778bccdd1d5ae2300e21bd (patch) | |
| tree | c76b2d68ffc944f35dd74b6bd1ddc4efb822ffb6 /.travis.yml | |
| parent | a39ebae0cd43b979128fb7b59922e2376ec42235 (diff) | |
| download | deluge-379ba33bb9feca6d47778bccdd1d5ae2300e21bd.tar.gz deluge-379ba33bb9feca6d47778bccdd1d5ae2300e21bd.tar.bz2 deluge-379ba33bb9feca6d47778bccdd1d5ae2300e21bd.zip | |
[Tests] Fix Xvfb for GTKUI tests running on TravisCI
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 876b8e65f..63cade1f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,6 @@ language: python python: - "2.7" -# Cache packages download with apt -cache: - directories: - - $HOME/.pip-cache/ - before_install: - lsb_release -a - sudo add-apt-repository ppa:deluge-team/ppa -y @@ -17,13 +12,14 @@ before_install: install: - bash -c "echo $APTPACKAGES" - sudo apt-get install $APTPACKAGES - - pip install "tox>=1.8" --download-cache $HOME/.pip-cache + - pip install "tox>=1.8" env: global: - PIP_DOWNLOAD_CACHE=$HOME/.pip-cache/ - APTPACKAGES="python-libtorrent" - APTPACKAGES_GTKUI="python-gobject python-glade2" + - DISPLAY=:99.0 matrix: - TOX_ENV=pydef - TOX_ENV=flake8 @@ -43,8 +39,8 @@ virtualenv: before_script: - export PYTHONPATH=$PYTHONPATH:$PWD - python -c "import libtorrent as lt; print lt.version" - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start + - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16" script: + - bash -c "echo $DISPLAY" - tox -e $TOX_ENV |