This commit is contained in:
jpellizzari
2016-10-26 15:10:29 -07:00
parent 268fe0e70a
commit 71fdc9c58b
4 changed files with 7 additions and 26 deletions

View File

@@ -87,7 +87,7 @@
"noprobe": "../scope stop && ../scope launch --no-probe --app.window 8760h",
"loadreport": "npm run noprobe && sleep 1 && curl -X POST -H \"Content-Type: application/json\" http://$BACKEND_HOST/api/report -d",
"perf:setup" : "docker-compose -f test/perfjankie/docker-compose.yml up -d",
"perf:run" : ". test/run-jankie.sh",
"perf:run" : "make ../ && . test/run-jankie.sh",
"perf:cleanup" : "docker-compose -f test/perfjankie/docker-compose.yml down",
"perf" : "npm run perf:setup && npm run perf:run"
},

View File

@@ -14,15 +14,13 @@ services:
- "true"
selenium:
container_name: 'selenium'
image: 'elgalu/selenium'
links:
- probe
image: 'selenium/standalone-chrome:3.0.0-dubnium'
ports:
- '4444:24444'
- '5900:25900'
- '4444:4444'
environment:
- TZ='US/Pacific'
shm_size: 1g
volumes:
- /dev/shm:/dev/shm
couchdb:
container_name: 'couchdb'
image: 'couchdb:1.6'

View File

@@ -51,22 +51,5 @@ perfjankie({
selenium: {
hostname: 'localhost', // or localhost or hub.browserstack.com
port: 4444,
},
// log: { // Expects the following methods,
// fatal: log,
// error: grunt.fail.warn.bind(grunt.fail),
// warn: grunt.log.error.bind(grunt.log),
// info: grunt.log.ok.bind(grunt.log),
// debug: grunt.verbose.writeln.bind(grunt.verbose),
// trace: grunt.log.debug.bind(grunt.log)
// }
log: [
'fatal',
'error',
'warn',
'info',
'debug',
'trace'
].reduce(n => (r, i) => { r[i] = log }, {})
}
});

View File

@@ -35,5 +35,5 @@ echo "Testing $COMMIT on $DATE"
# ../../scope stop
# make SUDO= -C ../..
# ../../scope launch
sleep 5
# sleep 5
COMMIT="$COMMIT" DATE=$DATE HOST=$HOST DEBUG=scope* node test/perfjankie/main.js