odsign_e2e_tests: do not assume time monotonicity across reboots
(cherry picked from commit a0dd228837fbbacb3d29445bdf027649567f94fb)
Fix: 194365586
Test: atest --iterations 10 com.android.tests.odsign.OnDeviceSigningHostTest
Merged-In: I824da7fb9bfc0c455c852f99d2564e89728170ea
Change-Id: I294f96474ac5c9265900f762020f6e65b934a046
diff --git a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
index 5245698..add3199 100644
--- a/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/OnDeviceSigningHostTest.java
@@ -261,19 +261,22 @@
final long firstField = Long.parseLong(firstUpdateEntry[i]);
final long secondField = Long.parseLong(secondUpdateEntry[i]);
if (i == LAST_UPDATE_MILLIS_INDEX) {
- // The second APEX lastUpdateMillis should be after the first.
+ // The second APEX lastUpdateMillis should be after the first, but a clock
+ // adjustment might reverse the order so we can't assert this (b/194365586).
assertTrue(
- "Last update time same or wrong relation" +
- firstField + " >= " + secondField,
- firstField < secondField);
+ "Last update times are expected to differ, but they are equal " +
+ firstField + " == " + secondField,
+ firstField != secondField);
} else if (i == COMPILATION_TIME_INDEX) {
- // Second compilation time should be after the first compilation time.
+ // The second compilation time should be after the first compilation time, but
+ // a clock adjustment might reverse the order so we can't assert this
+ // (b/194365586).
assertTrue(
- "Compilation time same or wrong relation" +
- firstField + " >= " + secondField,
- firstField < secondField);
+ "Compilation times are expected to differ, but they are equal " +
+ firstField + " == " + secondField,
+ firstField != secondField);
} else {
- // The remaining fields should be the same, ie trigger for compilation, status, etc
+ // The remaining fields should be the same, ie trigger for compilation.
assertTrue(
"Compilation entries differ for position " + i + ": " +
firstField + " != " + secondField,