From 84745c44dedb032ac1f8db009feb19f70cd9fcdd Mon Sep 17 00:00:00 2001
From: Syd Polk <spolk@mozilla.com>
Date: Mon, 6 Oct 2014 12:50:47 -0500
Subject: [PATCH] Bug 1075636 - steeplechase hangs if one of the clients
 crashes 	Per suggestion by ted: add exception handler when running
 shell 	script.

---
 steeplechase/runsteeplechase.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/steeplechase/runsteeplechase.py b/steeplechase/runsteeplechase.py
index a027e77..cd7c926 100644
--- a/steeplechase/runsteeplechase.py
+++ b/steeplechase/runsteeplechase.py
@@ -3,7 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from manifestparser import TestManifest
-from mozdevice import DeviceManagerSUT
+from mozdevice import DeviceManagerSUT, DMError
 from optparse import OptionParser
 from mozprofile import FirefoxProfile, Profile, Preferences
 from mozprofile.permissions import ServerLocations
@@ -99,6 +99,9 @@ class RunThread(threading.Thread):
         try:
             output = dm.shellCheckOutput(cmd, env=env)
             result = get_results(output)
+        except DMError as e:
+            output = "Error running build: " + e.msg
+            result = 0, 1
         finally:
             #TODO: actual result
             cond.acquire()