Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Update mocks to match harness update
Change-Id: Idc69f6a6dfb461df9ef02f15b2058202f4149129
diff --git a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
index 67e6ab1..9d11892 100644
--- a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
+++ b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
@@ -1554,8 +1554,7 @@
private void setRecoveryExpectationRecovery(RecoverableTestDevice mockDevice)
throws DeviceNotAvailableException {
- mockDevice.recoverDevice();
- EasyMock.expectLastCall().once();
+ EasyMock.expect(mockDevice.recoverDevice()).andReturn(true).once();
}
private void setRecoveryExpectationReboot(RecoverableTestDevice mockDevice)
@@ -1786,8 +1785,7 @@
andReturn("root 1234 com.drawelement.deqp").once();
// Recovery resets the connection
- mockDevice.recoverDevice();
- EasyMock.expectLastCall().once();
+ EasyMock.expect(mockDevice.recoverDevice()).andReturn(true);
// and attempts to kill the process again
EasyMock.expect(mockDevice.executeShellCommand(EasyMock.contains("ps"))).