commit 76f20615db5a77aa92936baa4eabbd87e8a637ed
author Xianyuan Jia <xianyuanjia@google.com> Mon Jan 13 11:26:48 2020 -0800
committer Xianyuan Jia <xianyuanjia@google.com> Mon Jan 13 11:38:26 2020 -0800
tree b1f74c738bc57f1aa1b622228bb73bc7587f71f9
parent 1dd1b6df079d585c490bdafb809b2677f90eb359

In TestInfoDecorator, only reraise a caught Exception as TestError if it isn't already a TestSignal.

Bug: 147562682
Test: local
Change-Id: Iaad219cf0c5f01f2380847092e794befc3f8d19c

acts/framework/acts/test_decorators.py

diff --git a/acts/framework/acts/test_decorators.py b/acts/framework/acts/test_decorators.py
index 624683f..e1cd37f 100644
--- a/acts/framework/acts/test_decorators.py
+++ b/acts/framework/acts/test_decorators.py
@@ -95,6 +95,8 @@
                 new_signal = signals.TestPass('')
             else:
                 new_signal = signals.TestFailure('')
+        except signals.TestSignal as signal:
+            new_signal = signal
         except Exception as cause:
             new_signal = signals.TestError(cause)