Merge "Mitigate the flake caused by testRun_withParFileNameOption_binaryNotFound." am: e2034d5d0f am: 9eb9ee2a8c am: 4dc1e2e80c

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/1357926

Change-Id: I644b0cfd735cac354d880198d81c247379862909

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/src/com/android/tradefed/testtype/mobly/MoblyBinaryHostTestTest.java b/tests/src/com/android/tradefed/testtype/mobly/MoblyBinaryHostTestTest.java
index 9aec77f49..c681fc7c5 100644
--- a/tests/src/com/android/tradefed/testtype/mobly/MoblyBinaryHostTestTest.java
+++ b/tests/src/com/android/tradefed/testtype/mobly/MoblyBinaryHostTestTest.java
@@ -43,6 +43,8 @@ import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.IRunUtil;
 import com.android.utils.FileUtils;
 
+import com.google.common.base.Throwables;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -175,6 +177,9 @@ public class MoblyBinaryHostTestTest {
         } catch (RuntimeException e) {
             verify(mSpyTest, never()).reportLogs(any(), any());
             assertEquals(
+                    String.format(
+                            "An unexpected exception was thrown, full stack trace: %s",
+                            Throwables.getStackTraceAsString(e)),
                     e.getMessage(),
                     String.format("Couldn't find a par file %s", mMoblyBinary2.getName()));
         }