From 9be9815da495db622048a4d19ede5c7aec7beaab Mon Sep 17 00:00:00 2001
From: John Berlin <n0tan3rd@gmail.com>
Date: Wed, 30 Jan 2019 15:06:24 -0500
Subject: [PATCH] travis integration test fixes: removed caching of pip from
 .travis.yml (#431)

update pip and setuptools when running install.sh found in .travis

use xenial

removed trailing dash

only run webrecorder-tests using chrome and firefox

only run webrecorder-tests using pywbtest and chrometest marker expression
---
 .travis.yml        | 19 ++++++++-----------
 .travis/install.sh |  1 +
 .travis/test.sh    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5d504e6b..f25e9b5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,12 @@ python:
   - "3.5"
   - "3.6"
 
-os:
-  - linux
+dist: xenial
 
 addons:
+  chrome: stable
+  firefox: latest
   sauce_connect: true
-  apt:
-    packages:
-      # This is required to run new chrome on old trusty
-      - libnss3
 
 env:
   - WR_TEST=no
@@ -22,17 +19,17 @@ env:
 
 cache:
   directories:
-    - $HOME/.cache/pip
     - node_modules
 
-sudo: true
+sudo: required
 
 install:
   - ./.travis/install.sh
 
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+before_install:
+  - "sysctl kernel.unprivileged_userns_clone=1"
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 
 script:
   - ./.travis/test.sh
diff --git a/.travis/install.sh b/.travis/install.sh
index 500dbdeb..a8ea2733 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+pip install --upgrade pip setuptools
 python setup.py -q install
 pip install -r extra_requirements.txt
 pip install coverage pytest-cov coveralls
diff --git a/.travis/test.sh b/.travis/test.sh
index dbd51861..a5ec1472 100755
--- a/.travis/test.sh
+++ b/.travis/test.sh
@@ -6,5 +6,5 @@ if [ "$WR_TEST" = "no" ]; then
     cd karma-tests && make test && cd ..
 else
     cd webrecorder-tests
-    INTRAVIS=1 pytest -m "pywbtest"
+    INTRAVIS=1 pytest -m "pywbtest and chrometest"
 fi