diff options
| author | Neil Fuller <nfuller@google.com> | 2017-10-04 17:07:24 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2017-10-25 14:06:24 +0100 |
| commit | f40c3b96f2188b5e010cc0a6c53328912e36e22f (patch) | |
| tree | d0f397c3ad6eed5522ed864b19e120d7b1febae0 | |
| parent | 5ea1946f8174bdd32fc014eb9f98af94e13f3a47 (diff) | |
| download | TimeZoneData-f40c3b96f2188b5e010cc0a6c53328912e36e22f.tar.gz | |
Track changes to dumpsys timezone output
RulesManagerService now outputs additional version information
in "dumpsys timezone" which can be tested for.
Bug: 65575839
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: I806d25ad6176883532a46dc3389f99b13cb1981f
Merged-In: I806d25ad6176883532a46dc3389f99b13cb1981f
(cherry picked from commit 2dc15a61af9a5e1e21ae34b66af9d801be4f8b7d)
| -rw-r--r-- | testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java index 71ae1d0..68fabc1 100644 --- a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java +++ b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java @@ -258,8 +258,10 @@ public class TimeZoneUpdateHostTest extends DeviceTestCase implements IBuildRece } private void assertActiveRulesVersion(String expectedRulesVersion) throws Exception { - // Dumpsys reports the version reported by ICU and libcore, but they should always match. - String expectedActiveRulesVersion = expectedRulesVersion + "," + expectedRulesVersion; + // Dumpsys reports the version reported by ICU, ZoneInfoDB and TimeZoneFinder and they + // should always match. + String expectedActiveRulesVersion = + expectedRulesVersion + "," + expectedRulesVersion + "," + expectedRulesVersion; String actualActiveRulesVersion = waitForNoOperationInProgressAndReturn(StateType.ACTIVE_RULES_VERSION); |