joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Refresh time before connectivity tests" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-06-04 10:01:32 +00:00 • committed by Gerrit Code Review
commit 8b8cf5d8d4
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
staticlibs/testutils/host/com/android/testutils/ConnectivityTestTargetPreparer.kt
View file

@ -61,6 +61,7 @@ open class ConnectivityTestTargetPreparer : BaseTargetPreparer() {
setUpdaterNetworkingEnabled(testInfo, enableChain = true,
enablePkgs = UPDATER_PKGS.associateWith { false })
runPreparerApk(testInfo)
refreshTime(testInfo)
}
private fun runPreparerApk(testInfo: TestInformation) {
@ -141,6 +142,14 @@ open class ConnectivityTestTargetPreparer : BaseTargetPreparer() {
.contains(":deny")
}
private fun refreshTime(testInfo: TestInformation,) {
// Forces a synchronous time refresh using the network. Time is fetched synchronously but
// this does not guarantee that system time is updated when it returns.
// This avoids flakes where the system clock rolls back, for example when using test
// settings like test_url_expiration_time in NetworkMonitor.
testInfo.exec("cmd network_time_update_service force_refresh")
}
override fun tearDown(testInfo: TestInformation, e: Throwable?) {
if (isTearDownDisabled) return
installer.tearDown(testInfo, e)