commit bbb0cb6e1b8ce8fa0e81c1e0504897c5835a8ccd
author Dan Shi <dshi@chromium.org> Mon Mar 24 17:50:57 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Mar 25 17:55:42 2014 +0000
tree be4a34502ee1e054fb276fa44ca3ea4ac3792601
parent 44cb545a7c0813d643ae34e9a6e5413426019b7a

[autotest] only repair servo if the servo is required and in lab

Only raise exception if servo is required.

BUG=chromium:355824
TEST=None

Change-Id: I53ba122144b0f002fe1776361a160da95dd387c5
Reviewed-on: https://chromium-review.googlesource.com/191373
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Dan Shi <dshi@chromium.org>
Tested-by: Dan Shi <dshi@chromium.org>

server/hosts/servo_host.py

diff --git a/server/hosts/servo_host.py b/server/hosts/servo_host.py
index b0c8644..fbbbc36 100644
--- a/server/hosts/servo_host.py
+++ b/server/hosts/servo_host.py
@@ -121,10 +121,11 @@
         try:
             self.verify()
         except:
-            if required_by_test and self.is_in_lab():
-                self.repair_full()
-            else:
-                raise
+            if required_by_test:
+                if not self.is_in_lab():
+                    raise
+                else:
+                    self.repair_full()
 
 
     def is_in_lab(self):
@@ -593,4 +594,4 @@
     elif servo_args is not None:
         return ServoHost(required_by_test=True, is_in_lab=False, **servo_args)
     else:
-        return None
\ No newline at end of file
+        return None