diff --git a/client/package.json b/client/package.json index 5209154d9..eefa918e4 100644 --- a/client/package.json +++ b/client/package.json @@ -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" }, diff --git a/client/test/perfjankie/docker-compose.yml b/client/test/perfjankie/docker-compose.yml index 99d493473..0e8687e83 100644 --- a/client/test/perfjankie/docker-compose.yml +++ b/client/test/perfjankie/docker-compose.yml @@ -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' diff --git a/client/test/perfjankie/main.js b/client/test/perfjankie/main.js index 4401b7240..5bd734a67 100644 --- a/client/test/perfjankie/main.js +++ b/client/test/perfjankie/main.js @@ -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 }, {}) - + } }); diff --git a/client/test/run-jankie.sh b/client/test/run-jankie.sh index 6fe05616f..394151239 100755 --- a/client/test/run-jankie.sh +++ b/client/test/run-jankie.sh @@ -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