commit 17b1001282e59fd770f211caa7faf5feb80afb13
author Alan Stokes <alanstokes@google.com> Fri Nov 06 16:57:53 2020 +0000
committer Alan Stokes <alanstokes@google.com> Fri Nov 06 16:57:53 2020 +0000
tree c80cbad36fad43be9924287c3b90f19c9381c506
parent 0ed618e50a9f7f1bc7331b146d95b01ec490bf43

Tweak NetworkWatchListTests.

Add logging to try to help diagnose flakiness.

And while I'm here, simplify & improve file closing logic.

Bug: 168216494
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest
Change-Id: I1c875102f0cce32cbbe2e3b36de913741c9abb92

tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java

diff --git a/tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java b/tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java
index 81a9e30..63b3f71 100644
--- a/tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkWatchlistTest.java
@@ -24,9 +24,10 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.platform.test.annotations.AppModeFull;
 import android.os.FileUtils;
 import android.os.ParcelFileDescriptor;
+import android.platform.test.annotations.AppModeFull;
+import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -132,14 +133,9 @@
 
     private void pipeResourceToFileDescriptor(String res, ParcelFileDescriptor pfd)
             throws IOException {
-        InputStream resStream = getClass().getClassLoader().getResourceAsStream(res);
-        FileOutputStream fdStream = new ParcelFileDescriptor.AutoCloseOutputStream(pfd);
-
-        FileUtils.copy(resStream, fdStream);
-
-        try {
-            fdStream.close();
-        } catch (IOException e) {
+        try (InputStream resStream = getClass().getClassLoader().getResourceAsStream(res);
+                FileOutputStream fdStream = new ParcelFileDescriptor.AutoCloseOutputStream(pfd)) {
+            FileUtils.copy(resStream, fdStream);
         }
     }
 
@@ -153,6 +149,8 @@
     }
 
     private void setWatchlistConfig(String watchlistConfigFile) throws Exception {
+        Log.w("NetworkWatchlistTest", "Setting watchlist config " + watchlistConfigFile
+                + " in " + Thread.currentThread().getName());
         cleanup();
         saveResourceToFile(watchlistConfigFile, TMP_CONFIG_PATH);
         final String cmdResult = runCommand(