From c168413a8efb8fecd74f3bed2932061102842d96 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Thu, 30 Nov 2017 10:23:58 -0500
Subject: [PATCH 1/2] Fix bug when running ipresolver under Gitlab CI

Since the container does contain IP data, this would fail
---
 util/ipresolver/test/test_ipresolver.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/util/ipresolver/test/test_ipresolver.py b/util/ipresolver/test/test_ipresolver.py
index 26e78d7fc..d5b604a8c 100644
--- a/util/ipresolver/test/test_ipresolver.py
+++ b/util/ipresolver/test/test_ipresolver.py
@@ -25,9 +25,14 @@ def aws_ip_range_data():
 
 def test_unstarted(app, test_aws_ip):
   ipresolver = IPResolver(app)
-  assert ipresolver.resolve_ip(test_aws_ip) is None
 
-def test_resolved(aws_ip_range_data, test_aws_ip, app,):
+  def get_data():
+    return None
+
+  with patch.object(ipresolver, '_get_aws_ip_ranges', get_data):
+    assert ipresolver.resolve_ip(test_aws_ip) is None
+
+def test_resolved(aws_ip_range_data, test_aws_ip, app):
     ipresolver = IPResolver(app)
 
     def get_data():

From 45931dc856410c78056cb3a0396724e16eee8d63 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <josephschorr@users.noreply.github.com>
Date: Thu, 30 Nov 2017 10:24:11 -0500
Subject: [PATCH 2/2] Add --no-sandbox flag to Karma test

---
 karma.conf.js | 8 +++++++-
 package.json  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 83c9e9b79..22b081f0c 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -58,7 +58,13 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['ChromeHeadless'],
+    browsers: ['ChromeNoSandbox'],
+    customLaunchers: {
+      ChromeNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      }
+    },
     singleRun: false,
     concurrency: Infinity,
     mime: {
diff --git a/package.json b/package.json
index fa3c588a8..828195b23 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "1.0.0",
   "scripts": {
     "dev": "karma start --browsers ChromeHeadless",
-    "test": "karma start --single-run --browsers ChromeHeadless",
+    "test": "karma start --single-run --browsers ChromeNoSandbox",
     "test:node": "JASMINE_CONFIG_PATH=static/test/jasmine.json jasmine-ts './static/js/**/*.spec.ts'",
     "e2e": "ts-node ./node_modules/.bin/protractor static/test/protractor.conf.ts",
     "build": "npm run clean && NODE_ENV=production webpack --progress",