Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java

Issue 2827673002: [Cronet] Fix ExperimentalOptionsTest flake (Closed)
Patch Set: Address comment Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.net; 5 package org.chromium.net;
6 6
7 import android.support.test.filters.SmallTest; 7 import android.support.test.filters.MediumTest;
8 8
9 import org.json.JSONObject; 9 import org.json.JSONObject;
10 10
11 import org.chromium.base.Log;
11 import org.chromium.base.PathUtils; 12 import org.chromium.base.PathUtils;
12 import org.chromium.base.test.util.Feature; 13 import org.chromium.base.test.util.Feature;
13 14
14 import java.io.BufferedReader;
15 import java.io.File; 15 import java.io.File;
16 import java.io.FileReader; 16 import java.io.FileInputStream;
17 import java.io.FileNotFoundException;
18 import java.io.IOException;
17 19
18 /** 20 /**
19 * Tests for experimental options. 21 * Tests for experimental options.
20 */ 22 */
21 public class ExperimentalOptionsTest extends CronetTestBase { 23 public class ExperimentalOptionsTest extends CronetTestBase {
22 private static final String TAG = ExperimentalOptionsTest.class.getSimpleNam e(); 24 private static final String TAG = ExperimentalOptionsTest.class.getSimpleNam e();
23 private CronetTestFramework mTestFramework; 25 private CronetTestFramework mTestFramework;
24 private ExperimentalCronetEngine.Builder mBuilder; 26 private ExperimentalCronetEngine.Builder mBuilder;
25 27
26 @Override 28 @Override
27 protected void setUp() throws Exception { 29 protected void setUp() throws Exception {
28 super.setUp(); 30 super.setUp();
29 mBuilder = new ExperimentalCronetEngine.Builder(getContext()); 31 mBuilder = new ExperimentalCronetEngine.Builder(getContext());
30 CronetTestUtil.setMockCertVerifierForTesting( 32 CronetTestUtil.setMockCertVerifierForTesting(
31 mBuilder, QuicTestServer.createMockCertVerifier()); 33 mBuilder, QuicTestServer.createMockCertVerifier());
32 assertTrue(Http2TestServer.startHttp2TestServer( 34 assertTrue(Http2TestServer.startHttp2TestServer(
33 getContext(), QuicTestServer.getServerCert(), QuicTestServer.get ServerCertKey())); 35 getContext(), QuicTestServer.getServerCert(), QuicTestServer.get ServerCertKey()));
34 } 36 }
35 37
36 @Override 38 @Override
37 protected void tearDown() throws Exception { 39 protected void tearDown() throws Exception {
38 assertTrue(Http2TestServer.shutdownHttp2TestServer()); 40 assertTrue(Http2TestServer.shutdownHttp2TestServer());
39 if (mTestFramework != null && mTestFramework.mCronetEngine != null) { 41 if (mTestFramework != null && mTestFramework.mCronetEngine != null) {
40 mTestFramework.mCronetEngine.shutdown(); 42 mTestFramework.mCronetEngine.shutdown();
41 } 43 }
42 super.tearDown(); 44 super.tearDown();
43 } 45 }
44 46
45 @SmallTest 47 @MediumTest
46 @Feature({"Cronet"}) 48 @Feature({"Cronet"})
47 @OnlyRunNativeCronet 49 @OnlyRunNativeCronet
48 // Tests that NetLog writes effective experimental options to NetLog. 50 // Tests that NetLog writes effective experimental options to NetLog.
49 public void testNetLog() throws Exception { 51 public void testNetLog() throws Exception {
50 File directory = new File(PathUtils.getDataDirectory()); 52 File directory = new File(PathUtils.getDataDirectory());
51 File logfile = File.createTempFile("cronet", "json", directory); 53 File logfile = File.createTempFile("cronet", "json", directory);
52 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules (); 54 JSONObject hostResolverParams = CronetTestUtil.generateHostResolverRules ();
53 JSONObject experimentalOptions = 55 JSONObject experimentalOptions =
54 new JSONObject().put("HostResolverRules", hostResolverParams); 56 new JSONObject().put("HostResolverRules", hostResolverParams);
55 mBuilder.setExperimentalOptions(experimentalOptions.toString()); 57 mBuilder.setExperimentalOptions(experimentalOptions.toString());
56 58
57 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der); 59 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der);
58 mTestFramework.mCronetEngine.startNetLogToFile(logfile.getPath(), false) ; 60 mTestFramework.mCronetEngine.startNetLogToFile(logfile.getPath(), false) ;
59 String url = Http2TestServer.getEchoMethodUrl(); 61 String url = Http2TestServer.getEchoMethodUrl();
60 TestUrlRequestCallback callback = new TestUrlRequestCallback(); 62 TestUrlRequestCallback callback = new TestUrlRequestCallback();
61 UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestB uilder( 63 UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestB uilder(
62 url, callback, callback.getExecutor()); 64 url, callback, callback.getExecutor());
63 UrlRequest urlRequest = builder.build(); 65 UrlRequest urlRequest = builder.build();
64 urlRequest.start(); 66 urlRequest.start();
65 callback.blockForDone(); 67 callback.blockForDone();
66 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); 68 assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
67 assertEquals("GET", callback.mResponseAsString); 69 assertEquals("GET", callback.mResponseAsString);
68 mTestFramework.mCronetEngine.stopNetLog(); 70 mTestFramework.mCronetEngine.stopNetLog();
69 assertTrue(logfile.exists()); 71 assertFileContainsString(logfile, "HostResolverRules");
70 assertTrue(logfile.length() != 0);
71 BufferedReader logReader = new BufferedReader(new FileReader(logfile));
72 boolean validFile = false;
73 try {
74 String logLine;
75 while ((logLine = logReader.readLine()) != null) {
76 if (logLine.contains("HostResolverRules")) {
77 validFile = true;
78 break;
79 }
80 }
81 } finally {
82 logReader.close();
83 }
84 assertTrue(validFile);
85 assertTrue(logfile.delete()); 72 assertTrue(logfile.delete());
86 assertTrue(!logfile.exists()); 73 assertFalse(logfile.exists());
87 } 74 }
88 75
89 @SmallTest 76 @MediumTest
90 @Feature({"Cronet"}) 77 @Feature({"Cronet"})
91 @OnlyRunNativeCronet 78 @OnlyRunNativeCronet
92 public void testSetSSLKeyLogFile() throws Exception { 79 public void testSetSSLKeyLogFile() throws Exception {
93 String url = Http2TestServer.getEchoMethodUrl(); 80 String url = Http2TestServer.getEchoMethodUrl();
94 File dir = new File(PathUtils.getDataDirectory()); 81 File dir = new File(PathUtils.getDataDirectory());
95 File file = File.createTempFile("ssl_key_log_file", "", dir); 82 File file = File.createTempFile("ssl_key_log_file", "", dir);
96 83
97 JSONObject experimentalOptions = new JSONObject().put("ssl_key_log_file" , file.getPath()); 84 JSONObject experimentalOptions = new JSONObject().put("ssl_key_log_file" , file.getPath());
98 mBuilder.setExperimentalOptions(experimentalOptions.toString()); 85 mBuilder.setExperimentalOptions(experimentalOptions.toString());
99 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der); 86 mTestFramework = new CronetTestFramework(null, null, getContext(), mBuil der);
100 87
101 TestUrlRequestCallback callback = new TestUrlRequestCallback(); 88 TestUrlRequestCallback callback = new TestUrlRequestCallback();
102 UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestB uilder( 89 UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestB uilder(
103 url, callback, callback.getExecutor()); 90 url, callback, callback.getExecutor());
104 UrlRequest urlRequest = builder.build(); 91 UrlRequest urlRequest = builder.build();
105 urlRequest.start(); 92 urlRequest.start();
106 callback.blockForDone(); 93 callback.blockForDone();
107 assertEquals(200, callback.mResponseInfo.getHttpStatusCode()); 94 assertEquals(200, callback.mResponseInfo.getHttpStatusCode());
108 assertEquals("GET", callback.mResponseAsString); 95 assertEquals("GET", callback.mResponseAsString);
109 96
110 assertTrue(file.exists()); 97 assertFileContainsString(file, "CLIENT_RANDOM");
111 assertTrue(file.length() != 0); 98 assertTrue(file.delete());
112 BufferedReader logReader = new BufferedReader(new FileReader(file)); 99 assertFalse(file.exists());
113 boolean validFile = false; 100 }
101
102 // Helper method to assert that file contains content. It retries 5 times
103 // with a 100ms interval.
104 private void assertFileContainsString(File file, String content) throws Exce ption {
105 boolean contains = false;
106 for (int i = 0; i < 5; i++) {
107 contains = fileContainsString(file, content);
108 if (contains) break;
109 Log.i(TAG, "Retrying...");
110 Thread.sleep(100);
111 }
112 assertTrue("file content doesn't match", contains);
113 }
114
115 // Returns whether a file contains a particular string.
116 private boolean fileContainsString(File file, String content) throws IOExcep tion {
117 FileInputStream fileInputStream = null;
118 Log.i(TAG, "looking for [%s] in %s", content, file.getName());
114 try { 119 try {
115 String logLine; 120 fileInputStream = new FileInputStream(file);
116 while ((logLine = logReader.readLine()) != null) { 121 byte[] data = new byte[(int) file.length()];
117 if (logLine.contains("CLIENT_RANDOM")) { 122 fileInputStream.read(data);
118 validFile = true; 123 String actual = new String(data, "UTF-8");
119 break; 124 boolean contains = actual.contains(content);
120 } 125 if (!contains) {
126 Log.i(TAG, "file content [%s]", actual);
121 } 127 }
128 return contains;
129 } catch (FileNotFoundException e) {
130 // Ignored this exception since the file will only be created when u pdates are
131 // flushed to the disk.
132 Log.i(TAG, "file not found");
122 } finally { 133 } finally {
123 logReader.close(); 134 if (fileInputStream != null) {
135 fileInputStream.close();
136 }
124 } 137 }
125 assertTrue(validFile); 138 return false;
126 assertTrue(file.delete());
127 assertTrue(!file.exists());
128 } 139 }
129 } 140 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698