Adding auto-investigation of one more flake

Reshuffling the tests to make the investigator the outmost rule and run
the code that throws the original exception inside the investigator.

Change-Id: I714717a9b616862db5ce59116138ba7ea6ceb971
This commit is contained in:
vadimt
2020-01-21 18:55:28 -08:00
parent d44326c2e7
commit 2c6316be46
7 changed files with 72 additions and 36 deletions

View File

@@ -62,6 +62,7 @@ import com.android.launcher3.util.ContentWriter;
import com.android.launcher3.util.LooperExecutor;
import com.android.launcher3.util.PackageManagerHelper;
import com.android.launcher3.util.Wait;
import com.android.launcher3.util.rule.FailureRewriterRule;
import com.android.launcher3.util.rule.FailureWatcher;
import com.android.launcher3.util.rule.LauncherActivityRule;
import com.android.launcher3.util.rule.ShellCommandRule;
@@ -161,9 +162,10 @@ public abstract class AbstractLauncherUiTest {
@Rule
public TestRule mOrderSensitiveRules = RuleChain.
outerRule(new TestStabilityRule()).
around(mActivityMonitor).
around(getRulesInsideActivityMonitor());
outerRule(new FailureRewriterRule())
.around(new TestStabilityRule())
.around(mActivityMonitor)
.around(getRulesInsideActivityMonitor());
public UiDevice getDevice() {
return mDevice;