Merge "Automatically diagnosing known flakes" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot 2020-01-21 22:56:35 +00:00 committed by Android (Google) Code Review
commit d44326c2e7
2 changed files with 81 additions and 0 deletions

View File

@ -0,0 +1,54 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.launcher3.util.rule;
import static androidx.test.InstrumentationRegistry.getInstrumentation;
import androidx.test.uiautomator.UiDevice;
import java.io.IOException;
import java.util.regex.Pattern;
class FailureInvestigator {
private static boolean matches(String regex, CharSequence string) {
return Pattern.compile(regex).matcher(string).find();
}
static int getBugForFailure(CharSequence exception, String testsStartTime) {
final String logSinceTestsStart;
try {
logSinceTestsStart =
UiDevice.getInstance(getInstrumentation())
.executeShellCommand("logcat -d -t " + testsStartTime.replace(" ", ""));
} catch (IOException e) {
return 0;
}
if (matches(
"java.lang.AssertionError: http://go/tapl : Tests are broken by a non-Launcher "
+ "system error: Phone is locked",
exception)) {
if (matches(
"BroadcastQueue: Can't deliver broadcast to com.android.systemui.*Crashing it",
logSinceTestsStart)) {
return 147845913;
}
}
return 0;
}
}

View File

@ -8,10 +8,13 @@ import androidx.test.uiautomator.UiDevice;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
public class FailureWatcher extends TestWatcher {
private static final String TAG = "FailureWatcher";
@ -35,6 +38,30 @@ public class FailureWatcher extends TestWatcher {
}
}
private static final String testsStartTime =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date());
@Override
public Statement apply(Statement base, Description description) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
try {
base.evaluate();
} catch (Throwable e) {
final int bug =
FailureInvestigator.getBugForFailure(e.toString(), testsStartTime);
if (bug == 0) throw e;
Log.e(TAG, "Known bug found for the original failure "
+ android.util.Log.getStackTraceString(e));
throw new AssertionError(
"Detected a failure that matches a known bug b/" + bug);
}
}
};
}
@Override
protected void failed(Throwable e, Description description) {
onError(mDevice, description, e);