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

Merge changes Ic20ea5a4,I1b32d9e0 into main

Browse Source 
* changes:
  Wait in loop
  Read all response to generate enough traffic while testing
This commit is contained in:
Junyu Lai
2023-07-11 07:07:29 +00:00
committed by Gerrit Code Review
parent 8abd1be521 a22daeac98
commit 2407c9398f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
View File

@@ -82,9 +82,9 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
@@ -220,7 +220,7 @@ public class NetworkStatsManagerTest {
} else { } else {
Log.w(LOG_TAG, "Network: " + networkInfo.toString()); Log.w(LOG_TAG, "Network: " + networkInfo.toString());
} }
InputStreamReader in = null; BufferedInputStream in = null;
HttpURLConnection urlc = null; HttpURLConnection urlc = null;
String originalKeepAlive = System.getProperty("http.keepAlive"); String originalKeepAlive = System.getProperty("http.keepAlive");
System.setProperty("http.keepAlive", "false"); System.setProperty("http.keepAlive", "false");
@@ -236,10 +236,10 @@ public class NetworkStatsManagerTest {
urlc.connect(); urlc.connect();
boolean ping = urlc.getResponseCode() == 200; boolean ping = urlc.getResponseCode() == 200;
if (ping) { if (ping) {
in = new InputStreamReader((InputStream) urlc.getContent()); in = new BufferedInputStream((InputStream) urlc.getContent());
// Since the test doesn't really care about the precise amount of data, instead while (in.read() != -1) {
// of reading all contents, just read few bytes at the beginning. // Comments to suppress lint error.
in.read(); }
} }
} catch (Exception e) { } catch (Exception e) {
Log.i(LOG_TAG, "Badness during exercising remote server: " + e); Log.i(LOG_TAG, "Badness during exercising remote server: " + e);
@@ -377,10 +377,15 @@ public class NetworkStatsManagerTest {
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build(), callback); .build(), callback);
synchronized (this) { synchronized (this) {
long now = System.currentTimeMillis();
final long deadline = (long) (now + TIMEOUT_MILLIS * 2.4);
while (!callback.success && now < deadline) {
try { try {
wait((int) (TIMEOUT_MILLIS * 2.4)); wait(deadline - now);
} catch (InterruptedException e) { } catch (InterruptedException e) {
} }
now = System.currentTimeMillis();
}
} }
if (callback.success) { if (callback.success) {
mNetworkInterfacesToTest[networkTypeIndex].setMetered(callback.metered); mNetworkInterfacesToTest[networkTypeIndex].setMetered(callback.metered);