LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add some timeout for waiting proxy being updated"

Browse Source
This commit is contained in:
Chiachang Wang
2023-07-04 11:40:13 +00:00
committed by Gerrit Code Review
parent df41b36fc9 3a323cf7cc
commit 8c0cefc928
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java
View File

@@ -1726,10 +1726,21 @@ public class VpnTest {
assertEquals(VpnManager.TYPE_VPN_SERVICE, ((VpnTransportInfo) ti).getType()); assertEquals(VpnManager.TYPE_VPN_SERVICE, ((VpnTransportInfo) ti).getType());
} }
private void assertDefaultProxy(ProxyInfo expected) { private void assertDefaultProxy(ProxyInfo expected) throws Exception {
assertEquals("Incorrect proxy config.", expected, mCM.getDefaultProxy()); assertEquals("Incorrect proxy config.", expected, mCM.getDefaultProxy());
String expectedHost = expected == null ? null : expected.getHost(); String expectedHost = expected == null ? null : expected.getHost();
String expectedPort = expected == null ? null : String.valueOf(expected.getPort()); String expectedPort = expected == null ? null : String.valueOf(expected.getPort());
// ActivityThread may not have time to set it in the properties yet which will cause flakes.
// Wait for some time to deflake the test.
int attempt = 0;
while (!(Objects.equals(expectedHost, System.getProperty("http.proxyHost"))
&& Objects.equals(expectedPort, System.getProperty("http.proxyPort")))
&& attempt < 300) {
attempt++;
Log.d(TAG, "Wait for proxy being updated, attempt=" + attempt);
Thread.sleep(100);
}
assertEquals("Incorrect proxy host system property.", expectedHost, assertEquals("Incorrect proxy host system property.", expectedHost,
System.getProperty("http.proxyHost")); System.getProperty("http.proxyHost"));
assertEquals("Incorrect proxy port system property.", expectedPort, assertEquals("Incorrect proxy port system property.", expectedPort,