commit 1f0d5336d2ee87f26f87c27fefed656223185dad
author Garry Wang <xianuowang@chromium.org> Mon Aug 10 19:32:32 2020 -0700
committer Otabek Kasimov <otabek@google.com> Tue Aug 11 18:31:43 2020 +0000
tree 269aae0a314ae1fba9cf38b0cb4f3b19f2fd57d9
parent ef7539924b4e5da46f3da9eafe9286d140972b5b

autotest: fix the issue that override global variable 'error'

BUG=None
TEST=run repair via failure path

Change-Id: I725b302674471c019129565b3487227a5b30d1c8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2348091
Tested-by: Garry Wang <xianuowang@chromium.org>
Reviewed-by: Otabek Kasimov <otabek@google.com>
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Otabek Kasimov <otabek@google.com>
Commit-Queue: Garry Wang <xianuowang@chromium.org>

server/hosts/servo_host.py

diff --git a/server/hosts/servo_host.py b/server/hosts/servo_host.py
index 7c72fc3..1971a60 100644
--- a/server/hosts/servo_host.py
+++ b/server/hosts/servo_host.py
@@ -1486,10 +1486,9 @@
         else:
             try:
                 newhost.reboot_servo_v3_on_need()
-            except Exception as error:
-                logging.info('[Non-critical] Unexpected error while trying'
-                              ' to reboot servo_v3, skipping the reboot; %s',
-                              error)
+            except Exception as e:
+                logging.info('[Non-critical] Unexpected error while trying to'
+                              ' reboot servo_v3, skipping the reboot; %s', e)
 
     if dut:
         newhost.set_dut_hostname(dut.hostname)