try 'monit restart' in compare_pixels_test.js

etpinard · etpinard · commit a179a917ca14 · 2015-11-27T11:33:35.000-05:00
diff --git a/circle.yml b/circle.yml
@@ -16,7 +16,6 @@ dependencies:
   post:
     - npm run cibuild
     - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:1.0.0;
-    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' myimageserver)" -- bash -c "pkill nw && /usr/local/bin/nw-wrapper.sh start nw1"
 
 test:
   override:
diff --git a/tasks/test_image.sh b/tasks/test_image.sh
@@ -23,8 +23,6 @@ IMAGE_VERSION="1.0.0"
 CMD=(
     "cd /var/www/streambed/image_server/plotly.js &&"
     "cp -f test/image/index.html ../server_app/index.html &&"
-    "monit restart nw1 &&"
-    "sleep 5 &&"
     "node test/image/compare_pixels_test.js $1"
 )
 
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -1,5 +1,6 @@
 var fs = require('fs');
 var path = require('path');
+var exec = require('child_process').exec;
 
 var constants = require('../../tasks/util/constants');
 var getOptions = require('../../tasks/util/get_image_request_options');
@@ -20,8 +21,11 @@ var touch = function(fileName) {
     fs.closeSync(fs.openSync(fileName, 'w'));
 };
 
-if (!userFileName) runAll();
-else runSingle(userFileName);
+// restart nw1 then test
+exec('monit restart nw1 && sleep 5', function() {
+    if(!userFileName) runAll();
+    else runSingle(userFileName);
+});
 
 function runAll () {
     test('testing mocks', function (t) {

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ IMAGE_VERSION="1.0.0"`
`23`	`23`	`CMD=(`
`24`	`24`	`"cd /var/www/streambed/image_server/plotly.js &&"`
`25`	`25`	`"cp -f test/image/index.html ../server_app/index.html &&"`
`26`		`- "monit restart nw1 &&"`
`27`		`- "sleep 5 &&"`
`28`	`26`	`"node test/image/compare_pixels_test.js $1"`
`29`	`27`	`)`
`30`	`28`