From fef75349fea68a80c2017d6d73e07579cb8305b9 Mon Sep 17 00:00:00 2001 From: Andrew Rayskiy Date: Thu, 23 Dec 2021 04:09:04 +0000 Subject: [PATCH] Web tests: Rename external/wpt/raw-sockets -> direct-sockets. Following https://github.com/WICG/direct-sockets/issues/10, the tests directory is renamed and all references are updated. Change-Id: I09ee495850666bc8dbe9964835c86aaf89ace555 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3347248 Auto-Submit: Andrew Rayskiy Reviewed-by: Eric Willigers Reviewed-by: Haiyang Pan Reviewed-by: Ian Kilpatrick Commit-Queue: Eric Willigers Cr-Commit-Position: refs/heads/main@{#953748} NOKEYCHECK=True GitOrigin-RevId: 1836d88793d920e5a1e71946aef66582e6b2d3eb --- blink/web_tests/NeverFixTests | 4 ++-- blink/web_tests/VirtualTestSuites | 2 +- blink/web_tests/android/WebviewWPTExpectations | 6 +++--- .../wpt/{raw-sockets => direct-sockets}/DIR_METADATA | 0 .../external/wpt/{raw-sockets => direct-sockets}/META.yml | 0 .../external/wpt/{raw-sockets => direct-sockets}/OWNERS | 0 .../external/wpt/{raw-sockets => direct-sockets}/README.md | 0 .../open-consume-activation.https.html | 0 .../open-consume-activation.https.html.headers | 0 .../open-securecontext.http.html | 0 .../open-without-user-gesture.https.html | 0 .../open-without-user-gesture.https.html.headers | 0 .../remotePort-required.https.html | 0 .../remotePort-required.https.html.headers | 0 .../direct-sockets/external/wpt/direct-sockets/README.txt | 2 ++ .../direct-sockets/external/wpt/raw-sockets/README.txt | 2 -- 16 files changed, 8 insertions(+), 8 deletions(-) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/DIR_METADATA (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/META.yml (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/OWNERS (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/README.md (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/open-consume-activation.https.html (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/open-consume-activation.https.html.headers (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/open-securecontext.http.html (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/open-without-user-gesture.https.html (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/open-without-user-gesture.https.html.headers (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/remotePort-required.https.html (100%) rename blink/web_tests/external/wpt/{raw-sockets => direct-sockets}/remotePort-required.https.html.headers (100%) create mode 100644 blink/web_tests/virtual/direct-sockets/external/wpt/direct-sockets/README.txt delete mode 100644 blink/web_tests/virtual/direct-sockets/external/wpt/raw-sockets/README.txt diff --git a/blink/web_tests/NeverFixTests b/blink/web_tests/NeverFixTests index 536cf9bec3e..88f4e7a1576 100644 --- a/blink/web_tests/NeverFixTests +++ b/blink/web_tests/NeverFixTests @@ -1819,8 +1819,8 @@ virtual/passive-fingerprinting/http/tests/navigation/frozen-useragent.html [ Pas # This test run under virtual suites only. crbug.com/1018640 external/wpt/web-bundle/wbn-from-network/* [ Skip ] virtual/wbn-from-network/external/wpt/web-bundle/wbn-from-network/* [ Pass ] -crbug.com/1119600 external/wpt/raw-sockets/* [ Skip ] -virtual/direct-sockets/external/wpt/raw-sockets/* [ Pass ] +crbug.com/1119600 external/wpt/direct-sockets/* [ Skip ] +virtual/direct-sockets/external/wpt/direct-sockets/* [ Pass ] crbug.com/1082020 http/tests/loading/wbn/origin-trial/* [ Skip ] virtual/subresource-web-bundles-disabled/http/tests/loading/wbn/origin-trial/* [ Pass ] diff --git a/blink/web_tests/VirtualTestSuites b/blink/web_tests/VirtualTestSuites index 259b263aee8..03f91e36387 100644 --- a/blink/web_tests/VirtualTestSuites +++ b/blink/web_tests/VirtualTestSuites @@ -462,7 +462,7 @@ }, { "prefix": "direct-sockets", - "bases": ["external/wpt/raw-sockets"], + "bases": ["external/wpt/direct-sockets"], "args": ["--enable-features=DirectSockets"] }, { diff --git a/blink/web_tests/android/WebviewWPTExpectations b/blink/web_tests/android/WebviewWPTExpectations index 070b3ab0333..88e704ed61c 100644 --- a/blink/web_tests/android/WebviewWPTExpectations +++ b/blink/web_tests/android/WebviewWPTExpectations @@ -4006,9 +4006,9 @@ crbug.com/1050754 external/wpt/quirks/percentage-height-calculation.html [ Failu crbug.com/1050754 external/wpt/quirks/table-cell-nowrap-minimum-width-calculation.html [ Failure ] crbug.com/1050754 external/wpt/quirks/table-cell-width-calculation.html [ Failure ] crbug.com/1050754 external/wpt/quirks/unitless-length/excluded-properties-003.html [ Failure Pass ] -crbug.com/1050754 external/wpt/raw-sockets/open-consume-activation.https.html [ Failure ] -crbug.com/1050754 external/wpt/raw-sockets/open-without-user-gesture.https.html [ Failure ] -crbug.com/1050754 external/wpt/raw-sockets/remotePort-required.https.html [ Failure ] +crbug.com/1050754 external/wpt/direct-sockets/open-consume-activation.https.html [ Failure ] +crbug.com/1050754 external/wpt/direct-sockets/open-without-user-gesture.https.html [ Failure ] +crbug.com/1050754 external/wpt/direct-sockets/remotePort-required.https.html [ Failure ] crbug.com/1050754 external/wpt/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html [ Failure ] crbug.com/1050754 external/wpt/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html [ Failure ] crbug.com/1050754 external/wpt/referrer-policy/4K+1/gen/top.http-rp/same-origin/sharedworker-classic.http.html [ Failure ] diff --git a/blink/web_tests/external/wpt/raw-sockets/DIR_METADATA b/blink/web_tests/external/wpt/direct-sockets/DIR_METADATA similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/DIR_METADATA rename to blink/web_tests/external/wpt/direct-sockets/DIR_METADATA diff --git a/blink/web_tests/external/wpt/raw-sockets/META.yml b/blink/web_tests/external/wpt/direct-sockets/META.yml similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/META.yml rename to blink/web_tests/external/wpt/direct-sockets/META.yml diff --git a/blink/web_tests/external/wpt/raw-sockets/OWNERS b/blink/web_tests/external/wpt/direct-sockets/OWNERS similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/OWNERS rename to blink/web_tests/external/wpt/direct-sockets/OWNERS diff --git a/blink/web_tests/external/wpt/raw-sockets/README.md b/blink/web_tests/external/wpt/direct-sockets/README.md similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/README.md rename to blink/web_tests/external/wpt/direct-sockets/README.md diff --git a/blink/web_tests/external/wpt/raw-sockets/open-consume-activation.https.html b/blink/web_tests/external/wpt/direct-sockets/open-consume-activation.https.html similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/open-consume-activation.https.html rename to blink/web_tests/external/wpt/direct-sockets/open-consume-activation.https.html diff --git a/blink/web_tests/external/wpt/raw-sockets/open-consume-activation.https.html.headers b/blink/web_tests/external/wpt/direct-sockets/open-consume-activation.https.html.headers similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/open-consume-activation.https.html.headers rename to blink/web_tests/external/wpt/direct-sockets/open-consume-activation.https.html.headers diff --git a/blink/web_tests/external/wpt/raw-sockets/open-securecontext.http.html b/blink/web_tests/external/wpt/direct-sockets/open-securecontext.http.html similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/open-securecontext.http.html rename to blink/web_tests/external/wpt/direct-sockets/open-securecontext.http.html diff --git a/blink/web_tests/external/wpt/raw-sockets/open-without-user-gesture.https.html b/blink/web_tests/external/wpt/direct-sockets/open-without-user-gesture.https.html similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/open-without-user-gesture.https.html rename to blink/web_tests/external/wpt/direct-sockets/open-without-user-gesture.https.html diff --git a/blink/web_tests/external/wpt/raw-sockets/open-without-user-gesture.https.html.headers b/blink/web_tests/external/wpt/direct-sockets/open-without-user-gesture.https.html.headers similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/open-without-user-gesture.https.html.headers rename to blink/web_tests/external/wpt/direct-sockets/open-without-user-gesture.https.html.headers diff --git a/blink/web_tests/external/wpt/raw-sockets/remotePort-required.https.html b/blink/web_tests/external/wpt/direct-sockets/remotePort-required.https.html similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/remotePort-required.https.html rename to blink/web_tests/external/wpt/direct-sockets/remotePort-required.https.html diff --git a/blink/web_tests/external/wpt/raw-sockets/remotePort-required.https.html.headers b/blink/web_tests/external/wpt/direct-sockets/remotePort-required.https.html.headers similarity index 100% rename from blink/web_tests/external/wpt/raw-sockets/remotePort-required.https.html.headers rename to blink/web_tests/external/wpt/direct-sockets/remotePort-required.https.html.headers diff --git a/blink/web_tests/virtual/direct-sockets/external/wpt/direct-sockets/README.txt b/blink/web_tests/virtual/direct-sockets/external/wpt/direct-sockets/README.txt new file mode 100644 index 00000000000..82047e41743 --- /dev/null +++ b/blink/web_tests/virtual/direct-sockets/external/wpt/direct-sockets/README.txt @@ -0,0 +1,2 @@ +# This suite runs external/wpt/direct-sockets/ with +# --enable-features=DirectSockets. diff --git a/blink/web_tests/virtual/direct-sockets/external/wpt/raw-sockets/README.txt b/blink/web_tests/virtual/direct-sockets/external/wpt/raw-sockets/README.txt deleted file mode 100644 index ab7bd381a94..00000000000 --- a/blink/web_tests/virtual/direct-sockets/external/wpt/raw-sockets/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This suite runs external/wpt/raw-sockets/ with -# --enable-features=DirectSockets.