Skip to content

GitLab

T
tangled
Commit 3dc6972f authored by Wolfgang Beyer's avatar Wolfgang Beyer Committed by Commit Bot
Browse files
Options

[DevTools] Update tests which use SDK.networkLog 

This CL updates the tests which use SDK.networkLog to use the static
instance() function instead. It also re-enables previously disabled
tests.

DevTools CL: https://crrev.com/c/2213439
CL disabling tests: https://crrev.com/c/2214952

Bug: chromium:1011811
Change-Id: I1843b16447ca480075f8a3e02abd8bf4ab715f48
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2213534Reviewed-by: default avatarTim van der Lippe <tvanderlippe@chromium.org>
Commit-Queue: Wolfgang Beyer <wolfi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772597}
parent 3f0a577e
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 43 deletions
third_party/blink/web_tests/TestExpectations
View file @ 3dc6972f
......@@ -4525,6 +4525,7 @@ crbug.com/785955 http/tests/credentialmanager/tools/virtual-authenticator-enviro
# Sheriff 2018-04-11
crbug.com/831796 fast/events/autoscroll-in-textfield.html [ Failure Pass ]
crbug.com/831673 http/tests/devtools/reveal-objects.js [ Pass Timeout ]
crbug.com/829952 fast/webgl/texImage-imageBitmap-from-image-resize.html [ Pass Timeout ]
crbug.com/832274 [ Linux ] fast/forms/search/search-appearance-basic.html [ Pass Failure ]
......@@ -5522,6 +5523,7 @@ crbug.com/1043893 [ Debug Mac10.13 ] webexposed/global-interface-listing-dedicat
crbug.com/1043893 [ Release ] webexposed/global-interface-listing-dedicated-worker.html [ Pass Timeout ]
crbug.com/1043920 [ Release Win ] http/tests/devtools/stylesheet-source-mapping.js [ Pass Timeout ]
crbug.com/1043920 [ Release Mac ] http/tests/devtools/stylesheet-source-mapping.js [ Pass Timeout ]
crbug.com/1044350 [ Release ] http/tests/devtools/network/network-xhr-replay.js [ Pass Timeout ]
crbug.com/1044414 [ Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Pass Timeout ]
crbug.com/1044415 [ Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Pass Timeout ]
crbug.com/1044424 [ Release ] http/tests/devtools/elements/css-rule-hover-highlights-selectors.js [ Pass Timeout ]
......@@ -5861,20 +5863,6 @@ crbug.com/1011811 http/tests/devtools/network/network-xhr-data-received-async-re
crbug.com/1011811 http/tests/devtools/network/download.js [ Pass Failure ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-disable-cache.js [ Pass Failure ]
# Disabled for landing DevTools change (https://crrev.com/c/2213439)
crbug.com/1011811 http/tests/devtools/network/extra-info-redirects.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/network/network-log-service-worker-navigate.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/network/network-status-non-http.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/network/network-xhr-replay.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/network/network-xsl-content.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/reveal-objects.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sources/debugger/async-callstack-network-initiator-image.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-cert-not-found.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-navigation-fail.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-navigation-redirect.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-navigation.js [ Pass Failure Timeout ]
crbug.com/1011811 http/tests/devtools/sxg/sxg-transfer-size.js [ Pass Failure Timeout ]
crbug.com/1080609 virtual/threaded/external/wpt/scroll-animations/element-based-offset.html [ Pass Failure ]
# Fails when test moved to use full compositor pipe.
......
third_party/blink/web_tests/http/tests/devtools/network/download.js
View file @ 3dc6972f
......@@ -23,7 +23,7 @@
TestRunner.addIframe('resources/download.zzz');
function responseReceived(requestId, time, resourceType, response) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/download\.zzz/.exec(request.url())) {
TestRunner.addResult('Received response for download.zzz');
......@@ -33,13 +33,13 @@
}
function loadingFinished(requestId, finishTime) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/download\.zzz/.exec(request.url())) TestRunner.completeTest();
}
function loadingFailed(requestId, time, localizedDescription, canceled) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/download\.zzz/.exec(request.url())) TestRunner.completeTest();
}
......
third_party/blink/web_tests/http/tests/devtools/network/extra-info-redirects.js
View file @ 3dc6972f
......@@ -19,7 +19,7 @@ new Promise(resolve => {
});
`);
const reqs = SDK.networkLog.requests().map(request => {
const reqs = SDK.NetworkLog.instance().requests().map(request => {
return {
url: request.url(),
hasExtraRequestInfo: request.hasExtraRequestInfo(),
......
third_party/blink/web_tests/http/tests/devtools/network/network-datareceived.js
View file @ 3dc6972f
......@@ -23,7 +23,7 @@
var encodedBytesReceived = 0;
function responseReceived(requestId, loaderId, time, resourceType, response, frameId) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/resource\.php/.exec(request.url())) {
TestRunner.addResult('Received response.');
encodedBytesReceived += response.encodedDataLength;
......@@ -31,7 +31,7 @@
}
function loadingFinished(requestId, finishTime, encodedDataLength) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/resource\.php/.exec(request.url())) {
TestRunner.assertEquals(encodedBytesReceived, encodedDataLength, 'Data length mismatch');
TestRunner.addResult('SUCCESS');
......@@ -40,7 +40,7 @@
}
function loadingFailed(requestId, time, localizedDescription, canceled) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/resource\.php/.exec(request.url())) {
TestRunner.addResult('Loading failed!');
TestRunner.completeTest();
......@@ -49,7 +49,7 @@
function dataReceived(requestId, time, dataLength, encodedDataLength) {
TestRunner.addSniffer(SDK.NetworkDispatcher.prototype, 'dataReceived', dataReceived);
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/resource\.php/.exec(request.url()))
encodedBytesReceived += encodedDataLength;
}
......
third_party/blink/web_tests/http/tests/devtools/network/network-initiator-chain.js
View file @ 3dc6972f
......@@ -15,7 +15,7 @@
var requests = NetworkTestRunner.networkRequests();
requests.forEach((request) => {
TestRunner.addResult('\n' + request.url());
var graph = SDK.networkLog.initiatorGraphForRequest(request);
var graph = SDK.NetworkLog.instance().initiatorGraphForRequest(request);
TestRunner.addResult('Initiators ' + Array.from(graph.initiators).map(request => request._url));
TestRunner.addResult('Initiated ' + Array.from(graph.initiated.keys()).map(request => request._url));
});
......
third_party/blink/web_tests/http/tests/devtools/network/network-log-service-worker-navigate.js
View file @ 3dc6972f
......@@ -15,7 +15,7 @@
await TestRunner.reloadPagePromise();
TestRunner.addResult('');
for (const request of SDK.networkLog.requests()) {
for (const request of SDK.NetworkLog.instance().requests()) {
const networkManager = SDK.NetworkManager.forRequest(request);
TestRunner.addResult('request.url(): ' + request.url());
TestRunner.addResult(
......
third_party/blink/web_tests/http/tests/devtools/network/network-status-non-http.js
View file @ 3dc6972f
......@@ -36,7 +36,7 @@
'//tbody/tr/td[position()=1]/@title', dataGrid, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
var outputStrings = [];
for (var request of SDK.networkLog.requests()) {
for (var request of SDK.NetworkLog.instance().requests()) {
var line = request.displayName + ':' + request.statusCode + ' ' + request.statusText;
if (request.failed)
line += '(failed)';
......
third_party/blink/web_tests/http/tests/devtools/network/network-xhr-data-received-async-response-type-blob.js
View file @ 3dc6972f
......@@ -14,7 +14,7 @@
'GET', 'resources/resource.php', true, undefined, undefined, [], false, undefined, 'blob', function() {});
function dataReceived(requestId, time, dataLength, encodedDataLength) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/resource\.php/.exec(request.url())) {
TestRunner.addResult('Received data for resource.php');
TestRunner.addResult('SUCCESS');
......
third_party/blink/web_tests/http/tests/devtools/network/network-xhr-replay.js
View file @ 3dc6972f
......@@ -34,11 +34,11 @@
NetworkTestRunner.makeXHR(method, url, async, user, password, headers, withCredentials, payload, type);
var originalRequest =
await TestRunner.waitForEvent(SDK.NetworkLog.Events.RequestAdded, SDK.networkLog);
await TestRunner.waitForEvent(SDK.NetworkLog.Events.RequestAdded, SDK.NetworkLog.instance());
await dumpRequest(originalRequest);
TestRunner.NetworkAgent.replayXHR(originalRequest.requestId());
var replayedRequest =
await TestRunner.waitForEvent(SDK.NetworkLog.Events.RequestAdded, SDK.networkLog);
await TestRunner.waitForEvent(SDK.NetworkLog.Events.RequestAdded, SDK.NetworkLog.instance());
assertRequestEqual(originalRequest, replayedRequest);
callback();
......
third_party/blink/web_tests/http/tests/devtools/network/network-xsl-content.js
View file @ 3dc6972f
......@@ -15,7 +15,7 @@
`);
var resultsOutput = [];
for (const request of SDK.networkLog.requests()) {
for (const request of SDK.NetworkLog.instance().requests()) {
const content = await TestRunner.NetworkAgent.getResponseBody(request.requestId());
var output = [];
output.push(request.url());
......
third_party/blink/web_tests/http/tests/devtools/reveal-objects.js
View file @ 3dc6972f
......@@ -59,7 +59,7 @@
TestRunner.evaluateInPage(`loadResource('${url}')`, firstXhrCallback);
function firstXhrCallback() {
requestWithResource = SDK.networkLog.requestForURL(resource.url);
requestWithResource = SDK.NetworkLog.instance().requestForURL(resource.url);
TestRunner.evaluateInPage('loadResource(\'missing.js\')', secondXhrCallback);
}
......
third_party/blink/web_tests/http/tests/devtools/sources/debugger/async-callstack-network-initiator-image.js
View file @ 3dc6972f
......@@ -23,7 +23,7 @@
if (!event.data.url().endsWith('resources/image.png'))
return;
var initiatorInfo = SDK.networkLog.initiatorInfoForRequest(event.data);
var initiatorInfo = SDK.NetworkLog.instance().initiatorInfoForRequest(event.data);
var element = new Components.Linkifier().linkifyScriptLocation(
TestRunner.mainTarget, initiatorInfo.scriptId, initiatorInfo.url, initiatorInfo.lineNumber,
initiatorInfo.columnNumber - 1);
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-cert-not-found.js
View file @ 3dc6972f
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
await TestRunner.addIframe('/loading/sxg/resources/sxg-cert-not-found.sxg');
await ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-disable-cache.js
View file @ 3dc6972f
......@@ -17,7 +17,7 @@
// Load the test signed exchange first, to cache the certificate file.
await TestRunner.addIframe(outerUrl);
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
await TestRunner.NetworkAgent.setCacheDisabled(true);
await TestRunner.addIframe(outerUrl + '?iframe-1');
......@@ -27,7 +27,7 @@
await TestRunner.addIframe(outerUrl + '?iframe-2');
await addPrefetchAndWait(outerUrl + '?prefetch-2', innerUrl);
for (var request of SDK.networkLog.requests()) {
for (var request of SDK.NetworkLog.instance().requests()) {
if (request.url() != certUrl)
continue;
TestRunner.addResult(`* ${request.url()}`);
......@@ -39,7 +39,7 @@
const promise = new Promise(resolve => {
TestRunner.addSniffer(SDK.NetworkDispatcher.prototype, 'loadingFinished', loadingFinished);
function loadingFinished(requestId, finishTime, encodedDataLength) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (request.url() == waitUrl) {
resolve();
} else {
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-navigation-fail.js
View file @ 3dc6972f
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
await TestRunner.addIframe('/loading/sxg/resources/sxg-invalid-validity-url.sxg');
await ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-navigation-redirect.js
View file @ 3dc6972f
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
const url =
'http://localhost:8000/resources/redirect.php?url=' +
encodeURIComponent(
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-navigation.js
View file @ 3dc6972f
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
await TestRunner.addIframe('/loading/sxg/resources/sxg-location.sxg');
await ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-prefetch-fail.js
View file @ 3dc6972f
......@@ -6,12 +6,12 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
const promise = new Promise(resolve => {
TestRunner.addSniffer(SDK.NetworkDispatcher.prototype, 'loadingFailed', loadingFailed, true);
function loadingFailed(requestId, time, localizedDescription, canceled) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/sxg-invalid-validity-url\.sxg/.exec(request.url()))
resolve();
}
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-prefetch.js
View file @ 3dc6972f
......@@ -6,12 +6,12 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
const promise = new Promise(resolve => {
TestRunner.addSniffer(SDK.NetworkDispatcher.prototype, 'loadingFinished', loadingFinished, true);
function loadingFinished(requestId, finishTime, encodedDataLength) {
var request = SDK.networkLog.requestByManagerAndId(TestRunner.networkManager, requestId);
var request = SDK.NetworkLog.instance().requestByManagerAndId(TestRunner.networkManager, requestId);
if (/inner-url\.html/.exec(request.url()))
resolve();
}
......
third_party/blink/web_tests/http/tests/devtools/sxg/sxg-transfer-size.js
View file @ 3dc6972f
......@@ -6,7 +6,7 @@
await TestRunner.loadModule('network_test_runner');
await TestRunner.loadModule('console_test_runner');
await TestRunner.showPanel('network');
SDK.networkLog.reset();
SDK.NetworkLog.instance().reset();
await TestRunner.addIframe('/loading/sxg/resources/sxg-larger-than-10k.sxg');
await ConsoleTestRunner.dumpConsoleMessages();
NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo();
......
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