Skip to content

GitLab

T
tangled
Commit 228ebf10 authored by tbansal's avatar tbansal Committed by Commit bot
Browse files
Options

Disable flaky NQE test in Cronet 

Disable flaky NetworkQualityEstimator (NQE) test in Cronet. Also, rename
a few NQE tests.

BUG=710626
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2850873002
Cr-Commit-Position: refs/heads/master@{#468342}
parent 07b83d70
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 200 deletions
components/cronet/android/BUILD.gn
View file @ 228ebf10
...@@ -682,6 +682,7 @@ android_library("cronet_javatests") { ...@@ -682,6 +682,7 @@ android_library("cronet_javatests") {
"test/javatests/src/org/chromium/net/GetStatusTest.java", "test/javatests/src/org/chromium/net/GetStatusTest.java",
"test/javatests/src/org/chromium/net/MetricsTestUtil.java", "test/javatests/src/org/chromium/net/MetricsTestUtil.java",
"test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java", "test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
"test/javatests/src/org/chromium/net/NQETest.java",
"test/javatests/src/org/chromium/net/PkpTest.java", "test/javatests/src/org/chromium/net/PkpTest.java",
"test/javatests/src/org/chromium/net/QuicTest.java", "test/javatests/src/org/chromium/net/QuicTest.java",
"test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java", "test/javatests/src/org/chromium/net/RequestFinishedInfoTest.java",
......
components/cronet/android/test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java
View file @ 228ebf10
...@@ -9,7 +9,6 @@ import android.content.ContextWrapper; ...@@ -9,7 +9,6 @@ import android.content.ContextWrapper;
import android.os.ConditionVariable; import android.os.ConditionVariable;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.StrictMode;
import android.support.test.filters.SmallTest; import android.support.test.filters.SmallTest;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -17,14 +16,9 @@ import org.json.JSONObject; ...@@ -17,14 +16,9 @@ import org.json.JSONObject;
import static org.chromium.net.CronetEngine.Builder.HTTP_CACHE_IN_MEMORY; import static org.chromium.net.CronetEngine.Builder.HTTP_CACHE_IN_MEMORY;
import org.chromium.base.FileUtils; import org.chromium.base.FileUtils;
import org.chromium.base.Log;
import org.chromium.base.PathUtils; import org.chromium.base.PathUtils;
import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import org.chromium.net.MetricsTestUtil.TestExecutor;
import org.chromium.net.TestUrlRequestCallback.ResponseStep; import org.chromium.net.TestUrlRequestCallback.ResponseStep;
import org.chromium.net.impl.CronetEngineBase; import org.chromium.net.impl.CronetEngineBase;
import org.chromium.net.impl.CronetEngineBuilderImpl; import org.chromium.net.impl.CronetEngineBuilderImpl;
...@@ -34,15 +28,10 @@ import org.chromium.net.test.EmbeddedTestServer; ...@@ -34,15 +28,10 @@ import org.chromium.net.test.EmbeddedTestServer;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
/** /**
...@@ -65,9 +54,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -65,9 +54,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
private String mUrl404; private String mUrl404;
private String mUrl500; private String mUrl500;
// Thread on which network quality listeners should be notified.
private Thread mNetworkQualityThread;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
...@@ -141,28 +127,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -141,28 +127,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
} }
} }
private class ExecutorThreadFactory implements ThreadFactory {
public Thread newThread(final Runnable r) {
mNetworkQualityThread = new Thread(new Runnable() {
@Override
public void run() {
StrictMode.ThreadPolicy threadPolicy = StrictMode.getThreadPolicy();
try {
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectNetwork()
.penaltyLog()
.penaltyDeath()
.build());
r.run();
} finally {
StrictMode.setThreadPolicy(threadPolicy);
}
}
});
return mNetworkQualityThread;
}
}
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
...@@ -188,170 +152,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase { ...@@ -188,170 +152,6 @@ public class CronetUrlRequestContextTest extends CronetTestBase {
assertEquals(userAgentValue, callback.mResponseAsString); assertEquals(userAgentValue, callback.mResponseAsString);
} }
@SmallTest
@Feature({"Cronet"})
@DisabledTest(message = "Disabled due to flaky assert. See crbug.com/710626")
public void testRealTimeNetworkQualityObservationsNotEnabled() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
Executor networkQualityExecutor = Executors.newSingleThreadExecutor();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(networkQualityExecutor);
TestNetworkQualityThroughputListener throughputListener =
new TestNetworkQualityThroughputListener(networkQualityExecutor, null);
try {
testFramework.mCronetEngine.addRttListener(rttListener);
fail("Should throw an exception.");
} catch (IllegalStateException e) {
}
try {
testFramework.mCronetEngine.addThroughputListener(throughputListener);
fail("Should throw an exception.");
} catch (IllegalStateException e) {
}
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
assertEquals(0, rttListener.rttObservationCount());
assertEquals(0, throughputListener.throughputObservationCount());
testFramework.mCronetEngine.shutdown();
}
@SmallTest
@Feature({"Cronet"})
public void testRealTimeNetworkQualityObservationsListenerRemoved() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
TestExecutor networkQualityExecutor = new TestExecutor();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(networkQualityExecutor);
mCronetEngineBuilder.enableNetworkQualityEstimator(true);
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
testFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true, false);
testFramework.mCronetEngine.addRttListener(rttListener);
testFramework.mCronetEngine.removeRttListener(rttListener);
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
networkQualityExecutor.runAllTasks();
assertEquals(0, rttListener.rttObservationCount());
testFramework.mCronetEngine.shutdown();
}
// Returns whether a file contains a particular string.
@SuppressFBWarnings("OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE")
private boolean fileContainsString(String filename, String content) throws IOException {
File file =
new File(CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + filename);
FileInputStream fileInputStream = new FileInputStream(file);
byte[] data = new byte[(int) file.length()];
fileInputStream.read(data);
fileInputStream.close();
return new String(data, "UTF-8").contains(content);
}
@SmallTest
@Feature({"Cronet"})
public void testRealTimeNetworkQualityObservationsQuicDisabled() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
assert RttThroughputValues.INVALID_RTT_THROUGHPUT < 0;
Executor listenersExecutor = Executors.newSingleThreadExecutor(new ExecutorThreadFactory());
ConditionVariable waitForThroughput = new ConditionVariable();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(listenersExecutor);
TestNetworkQualityThroughputListener throughputListener =
new TestNetworkQualityThroughputListener(listenersExecutor, waitForThroughput);
mCronetEngineBuilder.enableNetworkQualityEstimator(true).enableHttp2(true).enableQuic(
false);
mCronetEngineBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
testFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true, true);
testFramework.mCronetEngine.addRttListener(rttListener);
testFramework.mCronetEngine.addThroughputListener(throughputListener);
HistogramDelta writeCountHistogram = new HistogramDelta("NQE.Prefs.WriteCount", 1);
assertEquals(0, writeCountHistogram.getDelta()); // Sanity check.
HistogramDelta readCountHistogram = new HistogramDelta("NQE.Prefs.ReadCount", 1);
assertEquals(0, readCountHistogram.getDelta()); // Sanity check.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
// Throughput observation is posted to the network quality estimator on the network thread
// after the UrlRequest is completed. The observations are then eventually posted to
// throughput listeners on the executor provided to network quality.
waitForThroughput.block();
assertTrue(throughputListener.throughputObservationCount() > 0);
// Prefs must be read at startup.
assertTrue(readCountHistogram.getDelta() > 0);
// Check RTT observation count after throughput observation has been received. This ensures
// that executor has finished posting the RTT observation to the RTT listeners.
assertTrue(rttListener.rttObservationCount() > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_URL_REQUEST
assertTrue(rttListener.rttObservationCount(0) > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_TCP
assertTrue(rttListener.rttObservationCount(1) > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC
assertEquals(0, rttListener.rttObservationCount(2));
// Verify that the listeners were notified on the expected thread.
assertEquals(mNetworkQualityThread, rttListener.getThread());
assertEquals(mNetworkQualityThread, throughputListener.getThread());
// Verify that effective connection type callback is received and
// effective connection type is correctly set.
assertTrue(testFramework.mCronetEngine.getEffectiveConnectionType()
!= EffectiveConnectionType.TYPE_UNKNOWN);
// Verify that the HTTP RTT, transport RTT and downstream throughput
// estimates are available.
assertTrue(testFramework.mCronetEngine.getHttpRttMs() >= 0);
assertTrue(testFramework.mCronetEngine.getTransportRttMs() >= 0);
assertTrue(testFramework.mCronetEngine.getDownstreamThroughputKbps() >= 0);
// Verify that the cached estimates were written to the prefs.
while (true) {
Log.i(TAG, "Still waiting for pref file update.....");
Thread.sleep(12000);
try {
if (fileContainsString("local_prefs.json", "network_qualities")) {
break;
}
} catch (FileNotFoundException e) {
// Ignored this exception since the file will only be created when updates are
// flushed to the disk.
}
}
assertTrue(fileContainsString("local_prefs.json", "network_qualities"));
testFramework.mCronetEngine.shutdown();
assertTrue(writeCountHistogram.getDelta() > 0);
}
@SmallTest @SmallTest
@Feature({"Cronet"}) @Feature({"Cronet"})
// TODO: Remove the annotation after fixing http://crbug.com/637979 & http://crbug.com/637972 // TODO: Remove the annotation after fixing http://crbug.com/637979 & http://crbug.com/637972
......
components/cronet/android/test/javatests/src/org/chromium/net/NQETest.java 0 → 100644
View file @ 228ebf10
// Copyright 2017 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.os.ConditionVariable;
import android.os.StrictMode;
import android.support.test.filters.SmallTest;
import org.chromium.base.Log;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import org.chromium.net.MetricsTestUtil.TestExecutor;
import org.chromium.net.test.EmbeddedTestServer;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
/**
* Test Network Quality Estimator.
*/
@JNINamespace("cronet")
public class NQETest extends CronetTestBase {
private static final String TAG = NQETest.class.getSimpleName();
private EmbeddedTestServer mTestServer;
private String mUrl;
// Thread on which network quality listeners should be notified.
private Thread mNetworkQualityThread;
@Override
protected void setUp() throws Exception {
super.setUp();
mTestServer = EmbeddedTestServer.createAndStartServer(getContext());
mUrl = mTestServer.getURL("/echo?status=200");
}
private class ExecutorThreadFactory implements ThreadFactory {
public Thread newThread(final Runnable r) {
mNetworkQualityThread = new Thread(new Runnable() {
@Override
public void run() {
StrictMode.ThreadPolicy threadPolicy = StrictMode.getThreadPolicy();
try {
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
.detectNetwork()
.penaltyLog()
.penaltyDeath()
.build());
r.run();
} finally {
StrictMode.setThreadPolicy(threadPolicy);
}
}
});
return mNetworkQualityThread;
}
}
@SmallTest
@Feature({"Cronet"})
public void testNotEnabled() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
Executor networkQualityExecutor = Executors.newSingleThreadExecutor();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(networkQualityExecutor);
TestNetworkQualityThroughputListener throughputListener =
new TestNetworkQualityThroughputListener(networkQualityExecutor, null);
try {
testFramework.mCronetEngine.addRttListener(rttListener);
fail("Should throw an exception.");
} catch (IllegalStateException e) {
}
try {
testFramework.mCronetEngine.addThroughputListener(throughputListener);
fail("Should throw an exception.");
} catch (IllegalStateException e) {
}
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
assertEquals(0, rttListener.rttObservationCount());
assertEquals(0, throughputListener.throughputObservationCount());
testFramework.mCronetEngine.shutdown();
}
@SmallTest
@Feature({"Cronet"})
public void testListenerRemoved() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
TestExecutor networkQualityExecutor = new TestExecutor();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(networkQualityExecutor);
mCronetEngineBuilder.enableNetworkQualityEstimator(true);
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
testFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true, false);
testFramework.mCronetEngine.addRttListener(rttListener);
testFramework.mCronetEngine.removeRttListener(rttListener);
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
networkQualityExecutor.runAllTasks();
assertEquals(0, rttListener.rttObservationCount());
testFramework.mCronetEngine.shutdown();
}
// Returns whether a file contains a particular string.
@SuppressFBWarnings("OBL_UNSATISFIED_OBLIGATION_EXCEPTION_EDGE")
private boolean fileContainsString(String filename, String content) throws IOException {
File file =
new File(CronetTestFramework.getTestStorage(getContext()) + "/prefs/" + filename);
FileInputStream fileInputStream = new FileInputStream(file);
byte[] data = new byte[(int) file.length()];
fileInputStream.read(data);
fileInputStream.close();
return new String(data, "UTF-8").contains(content);
}
@SmallTest
@Feature({"Cronet"})
@DisabledTest(message = "Disabled due to flaky assert. See crbug.com/710626")
public void testQuicDisabled() throws Exception {
ExperimentalCronetEngine.Builder mCronetEngineBuilder =
new ExperimentalCronetEngine.Builder(getContext());
assert RttThroughputValues.INVALID_RTT_THROUGHPUT < 0;
Executor listenersExecutor = Executors.newSingleThreadExecutor(new ExecutorThreadFactory());
ConditionVariable waitForThroughput = new ConditionVariable();
TestNetworkQualityRttListener rttListener =
new TestNetworkQualityRttListener(listenersExecutor);
TestNetworkQualityThroughputListener throughputListener =
new TestNetworkQualityThroughputListener(listenersExecutor, waitForThroughput);
mCronetEngineBuilder.enableNetworkQualityEstimator(true).enableHttp2(true).enableQuic(
false);
mCronetEngineBuilder.setStoragePath(CronetTestFramework.getTestStorage(getContext()));
final CronetTestFramework testFramework =
startCronetTestFrameworkWithUrlAndCronetEngineBuilder(null, mCronetEngineBuilder);
testFramework.mCronetEngine.configureNetworkQualityEstimatorForTesting(true, true, true);
testFramework.mCronetEngine.addRttListener(rttListener);
testFramework.mCronetEngine.addThroughputListener(throughputListener);
HistogramDelta writeCountHistogram = new HistogramDelta("NQE.Prefs.WriteCount", 1);
assertEquals(0, writeCountHistogram.getDelta()); // Sanity check.
HistogramDelta readCountHistogram = new HistogramDelta("NQE.Prefs.ReadCount", 1);
assertEquals(0, readCountHistogram.getDelta()); // Sanity check.
TestUrlRequestCallback callback = new TestUrlRequestCallback();
UrlRequest.Builder builder = testFramework.mCronetEngine.newUrlRequestBuilder(
mUrl, callback, callback.getExecutor());
UrlRequest urlRequest = builder.build();
urlRequest.start();
callback.blockForDone();
// Throughput observation is posted to the network quality estimator on the network thread
// after the UrlRequest is completed. The observations are then eventually posted to
// throughput listeners on the executor provided to network quality.
waitForThroughput.block();
assertTrue(throughputListener.throughputObservationCount() > 0);
// Prefs must be read at startup.
assertTrue(readCountHistogram.getDelta() > 0);
// Check RTT observation count after throughput observation has been received. This ensures
// that executor has finished posting the RTT observation to the RTT listeners.
assertTrue(rttListener.rttObservationCount() > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_URL_REQUEST
assertTrue(rttListener.rttObservationCount(0) > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_TCP
assertTrue(rttListener.rttObservationCount(1) > 0);
// NETWORK_QUALITY_OBSERVATION_SOURCE_QUIC
assertEquals(0, rttListener.rttObservationCount(2));
// Verify that the listeners were notified on the expected thread.
assertEquals(mNetworkQualityThread, rttListener.getThread());
assertEquals(mNetworkQualityThread, throughputListener.getThread());
// Verify that effective connection type callback is received and
// effective connection type is correctly set.
assertTrue(testFramework.mCronetEngine.getEffectiveConnectionType()
!= EffectiveConnectionType.TYPE_UNKNOWN);
// Verify that the HTTP RTT, transport RTT and downstream throughput
// estimates are available.
assertTrue(testFramework.mCronetEngine.getHttpRttMs() >= 0);
assertTrue(testFramework.mCronetEngine.getTransportRttMs() >= 0);
assertTrue(testFramework.mCronetEngine.getDownstreamThroughputKbps() >= 0);
// Verify that the cached estimates were written to the prefs.
while (true) {
Log.i(TAG, "Still waiting for pref file update.....");
Thread.sleep(12000);
try {
if (fileContainsString("local_prefs.json", "network_qualities")) {
break;
}
} catch (FileNotFoundException e) {
// Ignored this exception since the file will only be created when updates are
// flushed to the disk.
}
}
assertTrue(fileContainsString("local_prefs.json", "network_qualities"));
testFramework.mCronetEngine.shutdown();
assertTrue(writeCountHistogram.getDelta() > 0);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment