Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 0f53ca3

Browse files
bashimoz-wptsync-bot
authored andcommitted
Bug 1729187 [wpt PR 30349] - Remove tools/quic and aioquic, a=testonly
Automatic update from web-platform-tests Remove tools/quic and aioquic (#30349) For WebTransport over HTTP/3, we plan to use virtualenv and requirements.txt for aioquic dependency. -- wpt-commits: d4353831216071b21558800f4e824508b56a2a4a wpt-pr: 30349
1 parent 4955226 commit 0f53ca3

File tree

133 files changed

+29
-21544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+29
-21544
lines changed

testing/web-platform/tests/docs/writing-tests/server-features.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ precise details of the response:
2222

2323
* *pywebsocket*, an existing websockets server
2424

25-
* *tools/quic*, a custom Python 3 QUIC server using `aioquic`
26-
2725
wptserve is a Python-based web server. By default it serves static
2826
files in the test suite. For more sophisticated requirements, several
2927
mechanisms are available to take control of the response. These are
@@ -134,25 +132,14 @@ supported in
134132
[OpenSSL 1.0.2](https://www.openssl.org/news/openssl-1.0.2-notes.html) and up.
135133

136134

137-
### Tests Requiring QUIC
138-
139-
We do not support loading a test over QUIC yet, but a test can establish a QUIC
140-
connection to the test server (e.g. for WebTransport, similar to WebSocket).
141-
Since the QUIC server is not yet enabled by default, tests must explicitly
142-
declare that they need access to the QUIC server:
135+
### Tests Requiring WebTransport over HTTP/3
143136

144-
* For HTML tests (including testharness.js and reference tests), add the
145-
following element:
146-
```html
147-
<meta name="quic" content="true">
148-
```
149-
* For JavaScript tests (auto-generated tests), add the following comment:
150-
```js
151-
// META: quic=true
152-
```
137+
We do not support loading a test over WebTransport over HTTP/3 yet, but a test
138+
can establish a WebTransport session to the test server.
153139

154-
The QUIC server is not yet enabled by default, so QUIC tests will be skipped
155-
unless `--enable-quic` is specified to `./wpt run`.
140+
The WebTransport over HTTP/3 server is not yet enabled by default, so
141+
WebTransport tests will fail unless `--enable-webtransport` is specified to
142+
`./wpt run`.
156143

157144
### Test Features specified as query params
158145

testing/web-platform/tests/tools/lint/lint.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,7 @@ def check(self, root):
694694

695695
def check_python_ast(repo_root, path, f):
696696
# type: (Text, Text, IO[bytes]) -> List[rules.Error]
697-
# *.quic.py are Python 3 only and cannot be parsed by Python 2.
698-
if not path.endswith(".py") or path.endswith(".quic.py"):
697+
if not path.endswith(".py"):
699698
return []
700699

701700
try:

testing/web-platform/tests/tools/manifest/item.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,6 @@ def jsshell(self):
198198
# type: () -> Optional[Text]
199199
return self._extras.get("jsshell")
200200

201-
@property
202-
def quic(self):
203-
# type: () -> Optional[bool]
204-
return self._extras.get("quic")
205-
206201
@property
207202
def script_metadata(self):
208203
# type: () -> Optional[List[Tuple[Text, Text]]]
@@ -217,8 +212,6 @@ def to_json(self):
217212
rv[-1]["testdriver"] = self.testdriver
218213
if self.jsshell:
219214
rv[-1]["jsshell"] = True
220-
if self.quic is not None:
221-
rv[-1]["quic"] = self.quic
222215
if self.script_metadata:
223216
rv[-1]["script_metadata"] = [(k, v) for (k,v) in self.script_metadata]
224217
return rv

testing/web-platform/tests/tools/manifest/sourcefile.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -738,36 +738,6 @@ def has_testdriver(self):
738738
return None
739739
return bool(self.testdriver_nodes)
740740

741-
@cached_property
742-
def quic_nodes(self):
743-
# type: () -> List[ElementTree.Element]
744-
"""List of ElementTree Elements corresponding to nodes in a test that
745-
specify whether it needs QUIC server."""
746-
assert self.root is not None
747-
return self.root.findall(".//{http://www.w3.org/1999/xhtml}meta[@name='quic']")
748-
749-
@cached_property
750-
def quic(self):
751-
# type: () -> Optional[bool]
752-
"""Boolean indicating whether a test requires QUIC server
753-
754-
Determined by <meta> elements (`quic_nodes()`) and "// META" comments
755-
(`script_metadata()`).
756-
"""
757-
if self.script_metadata:
758-
if any(m == ("quic", "true") for m in self.script_metadata):
759-
return True
760-
761-
if self.root is None:
762-
return None
763-
764-
if self.quic_nodes:
765-
quic_str = self.quic_nodes[0].attrib.get("content", "false") # type: Text
766-
if quic_str.lower() == "true":
767-
return True
768-
769-
return None
770-
771741
@cached_property
772742
def reftest_nodes(self):
773743
# type: () -> List[ElementTree.Element]
@@ -1031,7 +1001,6 @@ def manifest_items(self):
10311001
global_variant_url(self.rel_url, suffix) + variant,
10321002
timeout=self.timeout,
10331003
jsshell=jsshell,
1034-
quic=self.quic,
10351004
script_metadata=self.script_metadata
10361005
)
10371006
for (suffix, jsshell) in sorted(global_suffixes(globals))
@@ -1048,7 +1017,6 @@ def manifest_items(self):
10481017
self.url_base,
10491018
test_url + variant,
10501019
timeout=self.timeout,
1051-
quic=self.quic,
10521020
script_metadata=self.script_metadata
10531021
)
10541022
for variant in self.test_variants
@@ -1064,7 +1032,6 @@ def manifest_items(self):
10641032
self.url_base,
10651033
test_url + variant,
10661034
timeout=self.timeout,
1067-
quic=self.quic,
10681035
script_metadata=self.script_metadata
10691036
)
10701037
for variant in self.test_variants
@@ -1091,7 +1058,6 @@ def manifest_items(self):
10911058
self.url_base,
10921059
url,
10931060
timeout=self.timeout,
1094-
quic=self.quic,
10951061
testdriver=testdriver,
10961062
script_metadata=self.script_metadata
10971063
))
@@ -1105,7 +1071,6 @@ def manifest_items(self):
11051071
self.rel_url,
11061072
references=self.references,
11071073
timeout=self.timeout,
1108-
quic=self.quic,
11091074
viewport_size=self.viewport_size,
11101075
dpi=self.dpi,
11111076
fuzzy=self.fuzzy

testing/web-platform/tests/tools/manifest/tests/test_sourcefile.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ def test_worker():
170170
for item, url in zip(items, expected_urls):
171171
assert item.url == url
172172
assert item.timeout is None
173-
assert item.quic is None
174173

175174

176175
def test_window():
@@ -196,7 +195,6 @@ def test_window():
196195
for item, url in zip(items, expected_urls):
197196
assert item.url == url
198197
assert item.timeout is None
199-
assert item.quic is None
200198

201199

202200
def test_worker_long_timeout():
@@ -262,7 +260,6 @@ def test_worker_with_variants():
262260
for item, url in zip(items, expected_urls):
263261
assert item.url == url
264262
assert item.timeout is None
265-
assert item.quic is None
266263

267264

268265
def test_window_with_variants():
@@ -293,7 +290,6 @@ def test_window_with_variants():
293290
for item, url in zip(items, expected_urls):
294291
assert item.url == url
295292
assert item.timeout is None
296-
assert item.quic is None
297293

298294

299295
def test_python_long_timeout():
@@ -338,7 +334,6 @@ def test_multi_global():
338334
for item, url in zip(items, expected_urls):
339335
assert item.url == url
340336
assert item.timeout is None
341-
assert item.quic is None
342337

343338

344339
def test_multi_global_long_timeout():
@@ -398,7 +393,6 @@ def test_multi_global_with_custom_globals(input, expected):
398393
assert item.url == url
399394
assert item.jsshell is False
400395
assert item.timeout is None
401-
assert item.quic is None
402396

403397

404398
def test_multi_global_with_jsshell_globals():
@@ -429,7 +423,6 @@ def test_multi_global_with_jsshell_globals():
429423
assert item.url == url
430424
assert item.jsshell == jsshell
431425
assert item.timeout is None
432-
assert item.quic is None
433426

434427

435428
def test_multi_global_with_variants():
@@ -468,7 +461,6 @@ def test_multi_global_with_variants():
468461
for item, url in zip(items, expected_urls):
469462
assert item.url == url
470463
assert item.timeout is None
471-
assert item.quic is None
472464

473465

474466
@pytest.mark.parametrize("input,expected", [
@@ -677,35 +669,6 @@ def test_relative_testdriver(ext):
677669
assert not s.has_testdriver
678670

679671

680-
@pytest.mark.parametrize("ext", ["htm", "html"])
681-
def test_quic_html(ext):
682-
filename = "html/test." + ext
683-
684-
content = b'<meta name="quic" content="true">'
685-
s = create(filename, content)
686-
assert s.quic
687-
688-
content = b'<meta name="quic" content="false">'
689-
s = create(filename, content)
690-
assert s.quic is None
691-
692-
693-
def test_quic_js():
694-
filename = "html/test.any.js"
695-
696-
content = b"// META: quic=true"
697-
s = create(filename, content)
698-
_, items = s.manifest_items()
699-
for item in items:
700-
assert item.quic
701-
702-
content = b"// META: quic=false"
703-
s = create(filename, content)
704-
_, items = s.manifest_items()
705-
for item in items:
706-
assert item.quic is None
707-
708-
709672
@pytest.mark.parametrize("ext", ["htm", "html"])
710673
def test_reftest(ext):
711674
content = b"<link rel=match href=ref.html>"

testing/web-platform/tests/tools/mypy.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ warn_unused_ignores = True
2424

2525
# Ignore missing or untyped libraries.
2626

27-
[mypy-aioquic.*]
28-
ignore_missing_imports = True
29-
3027
[mypy-github.*]
3128
ignore_missing_imports = True
3229

testing/web-platform/tests/tools/quic/README.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

testing/web-platform/tests/tools/quic/__init__.py

Whitespace-only changes.

testing/web-platform/tests/tools/quic/certs/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

testing/web-platform/tests/tools/quic/certs/cert.key

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)