Merge "Not crashing tests when a test fails to deinitialize" into ub-launcher3-master

2026-03-02 08:56:55 +00:00 · 2020-01-29 21:46:27 +00:00
parent 07ccd59adf 053cb7a6e6
commit ae5e991f5e
2 changed files with 31 additions and 10 deletions
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -184,16 +184,8 @@ public abstract class AbstractLauncherUiTest {

    @After
    public void verifyLauncherState() {
-        try {
-            // Limits UI tests affecting tests running after them.
-            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);
-        }
+        // Limits UI tests affecting tests running after them.
+        mLauncher.waitForLauncherInitialized();
    }

    protected void clearLauncherData() throws IOException, InterruptedException {