From c822739f59ebd7f17d8f3f5c58e525603fbd1242 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Mon, 22 Jan 2018 10:39:30 +0100
Subject: [PATCH 1/2] Revert "require sudo for travis builds (#1517)"

This reverts commit b7c5fdb11273d1a56ea1edc96662b27dc1bb62b9.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e5ed5096d..aba4ba0ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   - "6"
 
-sudo: required
+sudo: false
 dist: trusty
 
 addons:

From 37bfd797745b513e81028983d40e980ebd074feb Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Mon, 22 Jan 2018 10:40:20 +0100
Subject: [PATCH 2/2] testem: Use `--no-sandbox` on TravisCI

---
 testem.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/testem.js b/testem.js
index 4395e7919..5b17bab41 100644
--- a/testem.js
+++ b/testem.js
@@ -1,3 +1,5 @@
+/* eslint-env node */
+
 module.exports = {
   framework: 'mocha',
   test_page: 'tests/index.html?hidepassed',
@@ -12,11 +14,14 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
         '--disable-gpu',
         '--headless',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
-      ]
+      ].filter(Boolean)
     },
   }
 };