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

Fix minor bug and deflaky for DnsResolverTest am: fcabfc688d am: f904b98507

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780

Change-Id: I7605d250d2980178617a631835f3234eb2d1b4c0
This commit is contained in:
Luke Huang
2020-11-09 06:05:51 +00:00
committed by Automerger Merge Worker
parent 8ed398fd4d f904b98507
commit 50afb08ab9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/DnsResolverTest.java
View File

@@ -28,6 +28,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.DnsResolver; import android.net.DnsResolver;
@@ -91,6 +92,7 @@ public class DnsResolverTest extends AndroidTestCase {
private ContentResolver mCR; private ContentResolver mCR;
private ConnectivityManager mCM; private ConnectivityManager mCM;
private PackageManager mPackageManager;
private CtsNetUtils mCtsNetUtils; private CtsNetUtils mCtsNetUtils;
private Executor mExecutor; private Executor mExecutor;
private Executor mExecutorInline; private Executor mExecutorInline;
@@ -109,6 +111,7 @@ public class DnsResolverTest extends AndroidTestCase {
mCR = getContext().getContentResolver(); mCR = getContext().getContentResolver();
mCtsNetUtils = new CtsNetUtils(getContext()); mCtsNetUtils = new CtsNetUtils(getContext());
mCtsNetUtils.storePrivateDnsSetting(); mCtsNetUtils.storePrivateDnsSetting();
mPackageManager = mContext.getPackageManager();
} }
@Override @Override
@@ -128,6 +131,9 @@ public class DnsResolverTest extends AndroidTestCase {
} }
private Network[] getTestableNetworks() { private Network[] getTestableNetworks() {
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
mCtsNetUtils.ensureWifiConnected();
}
final ArrayList<Network> testableNetworks = new ArrayList<Network>(); final ArrayList<Network> testableNetworks = new ArrayList<Network>();
for (Network network : mCM.getAllNetworks()) { for (Network network : mCM.getAllNetworks()) {
final NetworkCapabilities nc = mCM.getNetworkCapabilities(network); final NetworkCapabilities nc = mCM.getNetworkCapabilities(network);
@@ -555,6 +561,7 @@ public class DnsResolverTest extends AndroidTestCase {
@Override @Override
public void onError(@NonNull DnsResolver.DnsException error) { public void onError(@NonNull DnsResolver.DnsException error) {
mErrorMsg = mMsg + error.getMessage(); mErrorMsg = mMsg + error.getMessage();
mLatch.countDown();
} }
} }

2
tests/cts/net/util/java/android/net/cts/util/CtsNetUtils.java
View File

@@ -84,7 +84,7 @@ public final class CtsNetUtils {
private static final int SOCKET_TIMEOUT_MS = 2000; private static final int SOCKET_TIMEOUT_MS = 2000;
private static final int PRIVATE_DNS_PROBE_MS = 1_000; private static final int PRIVATE_DNS_PROBE_MS = 1_000;
private static final int PRIVATE_DNS_SETTING_TIMEOUT_MS = 6_000; private static final int PRIVATE_DNS_SETTING_TIMEOUT_MS = 10_000;
private static final int CONNECTIVITY_CHANGE_TIMEOUT_SECS = 30; private static final int CONNECTIVITY_CHANGE_TIMEOUT_SECS = 30;
public static final int HTTP_PORT = 80; public static final int HTTP_PORT = 80;
public static final String TEST_HOST = "connectivitycheck.gstatic.com"; public static final String TEST_HOST = "connectivitycheck.gstatic.com";