commit 940098a59ba98a5a284ad3600a0b10cc0b8dd86e
author Prasanthi Gangishetty <pgangishetty@google.com> Tue Dec 01 01:42:52 2020 +0000
committer Kalin Stoyanov <kalin@chromium.org> Tue Dec 01 17:07:33 2020 +0000
tree ff5a1536a9f6f9187ca39c66bd6ce65da912f646
parent d0a4ed420986bff3502e67c06e9db5d4eae13365

Revert "Move try catch statement in a cleanup() method"

This reverts commit 4c02a443582b3a473a24d5144421251b4450a283.

Reason for revert: Previous fix introduced a new error and test fails.

Original change's description:
> Move try catch statement in a cleanup() method
>
> BUG=chromium:1149636
> TEST=None
>
> Change-Id: I139da90fd636b8ffeca2580c9c0caebf495af546
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2558719
> Reviewed-by: Kalin Stoyanov <kalin@chromium.org>
> Tested-by: Prasanthi Gangishetty <pgangishetty@google.com>
> Commit-Queue: Prasanthi Gangishetty <pgangishetty@google.com>

Bug: chromium:1149636
Change-Id: I3bb1d44e29330326396de44f14cd267594833d88
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2566876
Reviewed-by: Prasanthi Gangishetty <pgangishetty@google.com>
Reviewed-by: Kalin Stoyanov <kalin@chromium.org>
Tested-by: Prasanthi Gangishetty <pgangishetty@google.com>

server/site_tests/platform_StageAndRecover/platform_StageAndRecover.py

diff --git a/server/site_tests/platform_StageAndRecover/platform_StageAndRecover.py b/server/site_tests/platform_StageAndRecover/platform_StageAndRecover.py
index b3f92b0..4c1319b 100644
--- a/server/site_tests/platform_StageAndRecover/platform_StageAndRecover.py
+++ b/server/site_tests/platform_StageAndRecover/platform_StageAndRecover.py
@@ -20,6 +20,10 @@
     _RECOVERY_LOG = '/recovery_logs*/recovery.log'
     _SET_DELAY = 2
 
+    def cleanup(self):
+        """ Clean up by switching servo usb towards servo host. """
+        self.host.servo.switch_usbkey('host')
+
 
     def initialize(self, host):
         """ Preparing servo to see only DUT_HUB1.
@@ -138,12 +142,6 @@
         self.wait_for_dut_ping_after('RECOVERY', self._INSTALL_DELAY_TIMEOUT)
         self.verify_recovery_log()
 
-        if self.error_messages:
-          raise error.TestFail('Failures: %s' % ' '.join(self.error_messages))
-
-
-    def cleanup(self):
-        """Installs test-image."""
         try:
             # Post-recovery exception handling : Test image installation is
             # out of scope of the test verification and these failures should
@@ -159,6 +157,6 @@
                 self.host.reboot()
         except error.AutoservRunError:
             pass
-        finally:
-            self.host.servo.switch_usbkey('host')
 
+        if self.error_messages:
+            raise error.TestFail('Failures: %s' % ' '.join(self.error_messages))