Delete the IRetriable interface am: c376ee5892 am: 2eb0628d58 am: 81519242e0 am: 0d09962845
am: 2176b3582c
Change-Id: Ie7c11d7a2525b31eda9a50bd89f96284e2eada5f
diff --git a/res/config/monkey/app-metrics.xml b/res/config/monkey/app-metrics.xml
index 76b8cee..2fdcec0 100644
--- a/res/config/monkey/app-metrics.xml
+++ b/res/config/monkey/app-metrics.xml
@@ -27,6 +27,5 @@
<option name="idle-time" value="0" />
<!-- 30 minute timeout for the monkey -->
<option name="monkey-timeout" value="30" />
- <option name="retry-on-failure" value="true" />
</test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/res/config/monkey/application.xml b/res/config/monkey/application.xml
index 711538d..cdbc227 100644
--- a/res/config/monkey/application.xml
+++ b/res/config/monkey/application.xml
@@ -27,7 +27,6 @@
<option name="idle-time" value="30" />
<!-- 30 minute timeout for the monkey -->
<option name="monkey-timeout" value="30" />
- <option name="retry-on-failure" value="true" />
</test>
<logger class="com.android.tradefed.log.FileLogger" />
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/com/android/monkey/MonkeyBase.java b/src/com/android/monkey/MonkeyBase.java
index baf2b91..215577b 100644
--- a/src/com/android/monkey/MonkeyBase.java
+++ b/src/com/android/monkey/MonkeyBase.java
@@ -40,7 +40,6 @@
import com.android.tradefed.result.TestDescription;
import com.android.tradefed.testtype.IDeviceTest;
import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.testtype.IRetriableTest;
import com.android.tradefed.util.ArrayUtil;
import com.android.tradefed.util.Bugreport;
import com.android.tradefed.util.CircularAtraceUtil;
@@ -69,7 +68,7 @@
import java.util.concurrent.TimeUnit;
/** Runner for stress tests which use the monkey command. */
-public class MonkeyBase implements IDeviceTest, IRemoteTest, IRetriableTest {
+public class MonkeyBase implements IDeviceTest, IRemoteTest {
public static final String MONKEY_LOG_NAME = "monkey_log";
public static final String BUGREPORT_NAME = "bugreport";
@@ -231,6 +230,8 @@
+ "flags and parameters as launched from Launcher. May be repeated")
private List<String> mLaunchComponents = new ArrayList<>();
+ /** @deprecated b/139751666 */
+ @Deprecated
@Option(name = "retry-on-failure", description = "Retry the test on failure")
private boolean mRetryOnFailure = false;
@@ -703,18 +704,6 @@
return mTestDevice;
}
- /**
- * {@inheritDoc}
- *
- * @return {@code false} if retry-on-failure is not set, if the monkey ran to completion,
- * crashed in an understood way, or if there were no packages to run, {@code true}
- * otherwise.
- */
- @Override
- public boolean isRetriable() {
- return mRetryOnFailure;
- }
-
/** Check the results and return if valid or throw an assertion error if not valid. */
private void checkResults() {
Assert.assertNotNull("Monkey log is null", mMonkeyLog);