Not crashing tests when a test fails to deinitialize
This causes nondescript diags "Test failed to run to completion. Reason: 'Instrumentation run failed due to 'Process crashed.''. Check device logcat for details" Now quietly skipping all consequent tests after such failure. Change-Id: I3747cda1a3094bfe82e27eae39ba9e9dfd4af9b6
This commit is contained in:
parent
ce67572ec8
commit
053cb7a6e6
|
@ -183,16 +183,8 @@ public abstract class AbstractLauncherUiTest {
|
||||||
|
|
||||||
@After
|
@After
|
||||||
public void verifyLauncherState() {
|
public void verifyLauncherState() {
|
||||||
try {
|
|
||||||
// Limits UI tests affecting tests running after them.
|
// Limits UI tests affecting tests running after them.
|
||||||
mLauncher.waitForLauncherInitialized();
|
mLauncher.waitForLauncherInitialized();
|
||||||
} catch (Throwable t) {
|
|
||||||
Log.e(TAG,
|
|
||||||
"Couldn't deinit after a test, exiting tests, see logs for failures that "
|
|
||||||
+ "could have caused this",
|
|
||||||
t);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void clearLauncherData() throws IOException, InterruptedException {
|
protected void clearLauncherData() throws IOException, InterruptedException {
|
||||||
|
|
|
@ -8,6 +8,7 @@ import androidx.test.uiautomator.UiDevice;
|
||||||
|
|
||||||
import org.junit.rules.TestWatcher;
|
import org.junit.rules.TestWatcher;
|
||||||
import org.junit.runner.Description;
|
import org.junit.runner.Description;
|
||||||
|
import org.junit.runners.model.Statement;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
@ -15,6 +16,7 @@ import java.io.IOException;
|
||||||
|
|
||||||
public class FailureWatcher extends TestWatcher {
|
public class FailureWatcher extends TestWatcher {
|
||||||
private static final String TAG = "FailureWatcher";
|
private static final String TAG = "FailureWatcher";
|
||||||
|
private static boolean sHadFailedTestDeinitialization;
|
||||||
final private UiDevice mDevice;
|
final private UiDevice mDevice;
|
||||||
|
|
||||||
public FailureWatcher(UiDevice device) {
|
public FailureWatcher(UiDevice device) {
|
||||||
|
@ -60,4 +62,31 @@ public class FailureWatcher extends TestWatcher {
|
||||||
|
|
||||||
device.takeScreenshot(new File(pathname));
|
device.takeScreenshot(new File(pathname));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Statement apply(Statement base, Description description) {
|
||||||
|
return new Statement() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void evaluate() throws Throwable {
|
||||||
|
if (sHadFailedTestDeinitialization) {
|
||||||
|
Log.d(TAG, "Skipping due to a recent test deinitialization failure: " +
|
||||||
|
description.getDisplayName());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
base.evaluate();
|
||||||
|
} catch (Throwable e) {
|
||||||
|
if (!Log.getStackTraceString(e).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.
|
||||||
|
sHadFailedTestDeinitialization = true;
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue