Bug 825460 - relay.py should not throw on socket exceptions, return F…

…alse instead. r=jmaher
mozilla · Dec 31, 2012 · 44ed213 · 44ed213
1 parent 4aa00f7
commit 44ed213
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/sut_tools/relay.py b/sut_tools/relay.py
@@ -106,13 +106,16 @@ def powercycle(relay_hostname, bank, relay):
     """
     assert(bank >= 1 and bank <= 4)
     assert(relay >= 1 and relay <= 8)
-    with connected_socket(relay_hostname, PORT) as sock:
+    try:
-        # Turn relay on to power off device
+        with connected_socket(relay_hostname, PORT) as sock:
-        if not set_status(sock, bank, relay, True):
+            # Turn relay on to power off device
-            return False
+            if not set_status(sock, bank, relay, True):
-        # Turn relay off to power on device
+                return False
-        if set_status(sock, bank, relay, False):
+            # Turn relay off to power on device
-            return False
+            if set_status(sock, bank, relay, False):
+                return False
+    except:
+        return False
     return True