Merge pull request #2922 from coreos-inc/fix-ci

Fix Quay CI

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: {

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",

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():