vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Fix Quay CI
This commit is contained in:
josephschorr 2017-11-30 20:07:45 +02:00 • committed by GitHub
commit 8f2d800ade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
karma.conf.js
View file

@ -58,7 +58,13 @@ module.exports = function(config) {
colors: true, colors: true,
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
browsers: ['ChromeHeadless'], browsers: ['ChromeNoSandbox'],
customLaunchers: {
ChromeNoSandbox: {
base: 'ChromeHeadless',
flags: ['--no-sandbox']
}
},
singleRun: false, singleRun: false,
concurrency: Infinity, concurrency: Infinity,
mime: { mime: {

2
package.json
View file

@ -5,7 +5,7 @@
"version": "1.0.0", "version": "1.0.0",
"scripts": { "scripts": {
"dev": "karma start --browsers ChromeHeadless", "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'", "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", "e2e": "ts-node ./node_modules/.bin/protractor static/test/protractor.conf.ts",
"build": "npm run clean && NODE_ENV=production webpack --progress", "build": "npm run clean && NODE_ENV=production webpack --progress",

7
util/ipresolver/test/test_ipresolver.py
View file

@ -25,9 +25,14 @@ def aws_ip_range_data():
def test_unstarted(app, test_aws_ip): def test_unstarted(app, test_aws_ip):
ipresolver = IPResolver(app) ipresolver = IPResolver(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 assert ipresolver.resolve_ip(test_aws_ip) is None
def test_resolved(aws_ip_range_data, test_aws_ip, app,): def test_resolved(aws_ip_range_data, test_aws_ip, app):
ipresolver = IPResolver(app) ipresolver = IPResolver(app)
def get_data(): def get_data():