ping imagetest after having restarting nw.js

- should fix some intermittent hangups when running the
  image tests locally

Author: etpinard

tasks/baseline.js

@@ -14,6 +14,4 @@ var cmd = containerCommands.getRunCmd(
 );
 
 console.log(msg);
-common.execCmd(containerCommands.ping, function() {
-    common.execCmd(cmd);
-});
+common.execCmd(cmd);

tasks/test_export.js

@@ -14,6 +14,4 @@ var cmd = containerCommands.getRunCmd(
 );
 
 console.log(msg);
-common.execCmd(containerCommands.ping, function() {
-    common.execCmd(cmd);
-});
+common.execCmd(cmd);

tasks/test_image.js

@@ -14,6 +14,4 @@ var cmd = containerCommands.getRunCmd(
 );
 
 console.log(msg);
-common.execCmd(containerCommands.ping, function() {
-    common.execCmd(cmd);
-});
+common.execCmd(cmd);

tasks/util/container_commands.js

@@ -21,7 +21,8 @@ containerCommands.setup = [
     containerCommands.cpIndex,
     containerCommands.injectEnv,
     containerCommands.restart,
-    'sleep 1',
+    containerCommands.ping,
+    'sleep 5'
 ].join(' && ');
 
 containerCommands.dockerRun = [
@@ -34,12 +35,17 @@ containerCommands.dockerRun = [
 
 containerCommands.getRunCmd = function(isCI, commands) {
     var _commands = Array.isArray(commands) ? commands.slice() : [commands];
+    var cmd;
 
-    if(isCI) return getRunCI(_commands);
+    if(isCI) {
+        _commands = [containerCommands.ping].concat(_commands);
+        cmd = getRunCI(_commands);
+    } else {
+        _commands = [containerCommands.setup].concat(_commands);
+        cmd = getRunLocal(_commands);
+    }
 
-    // add setup commands locally
-    _commands = [containerCommands.setup].concat(_commands);
-    return getRunLocal(_commands);
+    return cmd;
 };
 
 function getRunLocal(commands) {