google chrome install

bmcculley · bmcculley · commit c4d092976ac4 · 2016-06-03T12:57:08.000-04:00
diff --git a/.travis.chrome.sh b/.travis.chrome.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Holy shit batman!
+# https://github.com/travis-ci/travis-ci/issues/938
+# https://github.com/travis-ci/travis-ci/issues/2555
+
+sudo apt-get install -y python-software-properties
+sudo apt-add-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
+sudo sed -i s/deb-src.*google.*//g /etc/apt/sources.list
+wget -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+sudo apt-get update -qq
+sudo apt-get install -y google-chrome-stable
+
+sudo chmod 1777 /dev/shm
diff --git a/.travis.yml b/.travis.yml
@@ -2,15 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-sudo: false
+sudo: required
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - ./.travis.chrome.sh
 cache: pip
 addons:
   firefox: "latest"
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - google-chrome-stable
 language: python
 python:
   - "2.7"
@@ -36,7 +35,6 @@ matrix:
     - python: 3.5
       env: DRIVER=tests/test_zopetestbrowser.py
 install:
-  - export DISPLAY=:99.0
   - export PATH=$HOME:$PATH
   - ./travis-install.bash
   - make dependencies
