if instruments chooses not to die, leave it in its grave and find ano…

…ther one
appium · Dec 19, 2013 · 2622b25 · 2622b25
1 parent 049f9a6
commit 2622b25
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/devices/ios/instruments.js b/lib/devices/ios/instruments.js
@@ -20,6 +20,8 @@ var ERR_NEVER_CHECKED_IN = "Instruments never checked in"
 var Instruments = function(opts) {
   this.app = opts.app;
   this.launchTimeout = opts.launchTimeout || 90000;
+  this.killTimeout = 6000;
+  this.killTimer = null;
   this.flakeyRetries = opts.flakeyRetries;
   this.launchTries = 0;
   this.neverConnected = false;
@@ -116,6 +118,11 @@ Instruments.prototype.launchHandler = function(err) {
 Instruments.prototype.killProc = function() {
   if (this.proc !== null) {
     logger.info("Sending sigkill to instruments");
+    this.killTimer = setTimeout(function() {
+      logger.info("Instruments didn't die after " + (this.killTimeout / 1000) +
+                  " seconds; abandoning it completely");
+      this.onInstrumentsExit(1);
+    }.bind(this), this.killTimeout);
     this.proc.kill('SIGKILL');
   }
 };
@@ -257,6 +264,7 @@ Instruments.prototype.spawnInstruments = function(tmpDir) {
 };
 
 Instruments.prototype.onInstrumentsExit = function(code) {
+  clearTimeout(this.killTimer);
   this.debug("Instruments exited with code " + code);
 
   if (this.neverConnected) {