Merge "More diags for logic disabling other tests after a finalizer failure" into ub-launcher3-master
diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
index 7763cc2..02d07bb 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
@@ -78,10 +78,14 @@
try {
base.evaluate();
} catch (Throwable e) {
- if (!Log.getStackTraceString(e).contains(
+ final String stackTrace = Log.getStackTraceString(e);
+ if (!stackTrace.contains(
"androidx.test.internal.runner.junit4.statement.RunBefores.evaluate")) {
// Test failed to deinitialize. Since the global state is probably
// corrupted, won't execute other tests.
+ Log.d(TAG,
+ "Detected an exception from test finalizer, will skip further "
+ + "tests: " + stackTrace);
sHadFailedTestDeinitialization = true;
}
throw e;