Instrument flaky tests in CronetUrlRequestContextTest

components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.net;
 
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.StrictMode;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.FileUtils;
+import org.chromium.base.Log;
 import org.chromium.base.PathUtils;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.TestUrlRequestCallback.ResponseStep;
 import org.chromium.net.impl.CronetLibraryLoader;
 import org.chromium.net.impl.CronetUrlRequestContext;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.NoSuchElementException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 
 /**
  * Test CronetEngine.
  */
 @JNINamespace("cronet")
 public class CronetUrlRequestContextTest extends CronetTestBase {
     // URLs used for tests.
     private static final String MOCK_CRONET_TEST_FAILED_URL =
             "http://mock.failed.request/-2";
     private static final String MOCK_CRONET_TEST_SUCCESS_URL =
             "http://mock.http/success.txt";
+    private static final String TAG = "cr_RequestCtxTest";

[xunjieli, 2016/08/16 16:28:46]

cr prefix is automatically added now. Just fyi. No need to change it.

     private static final int MAX_FILE_SIZE = 1000000000;
     private static final int NUM_EVENT_FILES = 10;
 
     private EmbeddedTestServer mTestServer;
     private String mUrl;
     private String mUrl404;
     private String mUrl500;
     CronetTestFramework mTestFramework;
 
     // Thread on which network quality listeners should be notified.
@@ skipping 40 matching lines @@
         }
     }
 
     /**
      * Callback that shutdowns the request context when request has succeeded
      * or failed.
      */
     class ShutdownTestUrlRequestCallback extends TestUrlRequestCallback {
         @Override
         public void onSucceeded(UrlRequest request, UrlResponseInfo info) {
+            // TODO: Remove logging when http://crbug.com/596929 & http://crbug.com/635025 is fixed.
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.onSucceeded() has started");
             super.onSucceeded(request, info);
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.onSucceeded() before calling shutdown");
             mTestFramework.mCronetEngine.shutdown();
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.hasFinished() has finished");
         }
 
         @Override
         public void onFailed(UrlRequest request, UrlResponseInfo info, UrlRequestException error) {
+            // TODO: Remove logging when http://crbug.com/596929 & http://crbug.com/635025 is fixed.
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.onFailed() has started");
             super.onFailed(request, info, error);
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.onFailed() before calling shutdown");
             mTestFramework.mCronetEngine.shutdown();
+            Log.d(TAG, "ShutdownTestUrlRequestCallback.onFailed() has finished.");
         }
     }
 
     static class TestExecutor implements Executor {
         private final LinkedList<Runnable> mTaskQueue = new LinkedList<Runnable>();
 
         @Override
         public void execute(Runnable task) {
             mTaskQueue.add(task);
         }
@@ skipping 209 matching lines @@
         // Verify that effective connection type callback is received and
         // effective connection type is correctly set.
         assertTrue(mTestFramework.mCronetEngine.getEffectiveConnectionType()
                 != EffectiveConnectionType.EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
 
         mTestFramework.mCronetEngine.shutdown();
     }
 
     @SmallTest
     @Feature({"Cronet"})
+    // TODO: Remove the annotation after fixing http://crbug.com/637979 & http://crbug.com/637972
+    @OnlyRunNativeCronet
     public void testShutdown() throws Exception {
+        Log.i(TAG, "testShutdown() has started");
         mTestFramework = startCronetTestFramework();
         TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback();
         // Block callback when response starts to verify that shutdown fails
         // if there are active requests.
         callback.setAutoAdvance(false);
         UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(
                 mUrl, callback, callback.getExecutor(), mTestFramework.mCronetEngine);
         UrlRequest urlRequest = urlRequestBuilder.build();
         urlRequest.start();
         try {
@@ skipping 23 matching lines @@
         } catch (Exception e) {
             assertEquals("Cannot shutdown with active requests.",
                          e.getMessage());
         }
 
         // May not have read all the data, in theory. Just enable auto-advance
         // and finish the request.
         callback.setAutoAdvance(true);
         callback.startNextRead(urlRequest);
         callback.blockForDone();
+        // TODO: Remove sleep when http://crbug.com/596929 is fixed.
+        // The sleep gives the thread that shuts down the engine time to complete.
+        // See http://crbug.com/596929
+        Thread.sleep(3000);
+        Log.i(TAG, "testShutdown() has finished");
     }
 
     @SmallTest
     @Feature({"Cronet"})
     @OnlyRunNativeCronet
     public void testShutdownDuringInit() throws Exception {
         final CronetTestFramework testFramework = startCronetTestFrameworkAndSkipLibraryInit();
         final ConditionVariable block = new ConditionVariable(false);
 
         // Post a task to main thread to block until shutdown is called to test
@@ skipping 70 matching lines @@
             mTestFramework.mCronetEngine.shutdown();
             mTestFramework.mCronetEngine.shutdown();
             fail("Should throw an exception");
         } catch (Exception e) {
             assertEquals("Engine is shut down.", e.getMessage());
         }
     }
 
     @SmallTest
     @Feature({"Cronet"})
+    // TODO: Remove the annotation after fixing http://crbug.com/637972
+    @OnlyRunNativeCronet
     public void testShutdownAfterError() throws Exception {
+        Log.i(TAG, "testShutdownAfterError() has started");
         mTestFramework = startCronetTestFramework();
         TestUrlRequestCallback callback = new ShutdownTestUrlRequestCallback();
         UrlRequest.Builder urlRequestBuilder = new UrlRequest.Builder(MOCK_CRONET_TEST_FAILED_URL,
                 callback, callback.getExecutor(), mTestFramework.mCronetEngine);
         urlRequestBuilder.build().start();
         callback.blockForDone();
         assertTrue(callback.mOnErrorCalled);
+        // TODO: Remove sleep when http://crbug.com/635025 is fixed.
+        // The sleep gives the thread that shuts down the engine time to complete.
+        // See http://crbug.com/637986
+        Thread.sleep(3000);
+        Log.i(TAG, "testShutdownAfterError() has finished");
     }
 
     @SmallTest
     @Feature({"Cronet"})
     public void testShutdownAfterCancel() throws Exception {
         mTestFramework = startCronetTestFramework();
         TestUrlRequestCallback callback = new TestUrlRequestCallback();
         // Block callback when response starts to verify that shutdown fails
         // if there are active requests.
         callback.setAutoAdvance(false);
@@ skipping 857 matching lines @@
                     }
                 }.start();
                 otherThreadDone.block();
                 builder.build().shutdown();
                 uiThreadDone.open();
             }
         });
         assertTrue(uiThreadDone.block(1000));
     }
 }