wpt: add header-value-combining.any.js

Author: KhafraDev

test/wpt/runner/runner/runner.mjs

@@ -3,7 +3,7 @@ import { readdirSync, readFileSync, statSync } from 'node:fs'
 import { basename, isAbsolute, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { Worker } from 'node:worker_threads'
-import { parseMeta, handlePipes } from './util.mjs'
+import { parseMeta, handlePipes, normalizeName } from './util.mjs'
 
 const basePath = fileURLToPath(join(import.meta.url, '../../..'))
 const testPath = join(basePath, 'tests')
@@ -130,7 +130,9 @@ export class WPTRunner extends EventEmitter {
       if (message.result.status === 1) {
         this.#stats.failed += 1
 
-        if (allowUnexpectedFailures || (fail && fail.includes(message.result.name))) {
+        const name = normalizeName(message.result.name)
+
+        if (allowUnexpectedFailures || fail?.includes(name)) {
           this.#stats.expectedFailures += 1
         } else {
           process.exitCode = 1

test/wpt/runner/runner/util.mjs

@@ -1,4 +1,5 @@
 import { exit } from 'node:process'
+import { inspect } from 'node:util'
 
 /**
  * Parse the `Meta:` tags sometimes included in tests.
@@ -117,3 +118,16 @@ export function handlePipes (code, url) {
     }
   })
 }
+
+/**
+ * Some test names may contain characters that JSON cannot handle.
+ * @param {string} name
+ */
+export function normalizeName (name) {
+  return name.replace(/(\v)/g, (_, match) => {
+    switch (inspect(match)) {
+      case `'\\x0B'`: return '\\x0B'
+      default: return match
+    }
+  })
+}

test/wpt/server/server.mjs

@@ -3,7 +3,7 @@ import { createServer } from 'node:http'
 import { join } from 'node:path'
 import process from 'node:process'
 import { fileURLToPath } from 'node:url'
-import { createReadStream } from 'node:fs'
+import { createReadStream, readFileSync } from 'node:fs'
 import { setTimeout as sleep } from 'node:timers/promises'
 
 const tests = fileURLToPath(join(import.meta.url, '../../tests'))
@@ -204,6 +204,20 @@ const server = createServer(async (req, res) => {
       res.end('garbage')
       break
     }
+    case '/xhr/resources/headers-www-authenticate.asis':
+    case '/xhr/resources/headers-some-are-empty.asis':
+    case '/xhr/resources/headers-basic':
+    case '/xhr/resources/headers-double-empty.asis':
+    case '/xhr/resources/header-content-length-twice.asis':
+    case '/xhr/resources/header-content-length.asis': {
+      let asis = readFileSync(join(tests, fullUrl.pathname), 'utf-8')
+      asis = asis.replace(/\n/g, '\r\n')
+      asis = `${asis}\r\n`
+
+      res.socket.write(asis)
+      res.end()
+      break
+    }
     default: {
       res.statusCode = 200
       res.end('body')

test/wpt/status/fetch.status.json

@@ -54,5 +54,13 @@
 			"Set content type to the empty string for slice with invalid content type",
 			"Set content type to the empty string for slice with no content type "
 		]
+	},
+	"header-value-combining.any.js": {
+		"fail": [
+			"response.headers.get('content-length') expects 0, 0",
+			"response.headers.get('double-trouble') expects , ",
+			"response.headers.get('foo-test') expects 1, 2, 3",
+			"response.headers.get('heya') expects , \\x0B\f, 1, , , 2"
+		]
 	}
 }

test/wpt/tests/fetch/api/basic/header-value-combining.any.js

@@ -0,0 +1,15 @@
+// META: global=window,worker
+
+[
+  ["content-length", "0", "header-content-length"],
+  ["content-length", "0, 0", "header-content-length-twice"],
+  ["double-trouble", ", ", "headers-double-empty"],
+  ["foo-test", "1, 2, 3", "headers-basic"],
+  ["heya", ", \u000B\u000C, 1, , , 2", "headers-some-are-empty"],
+  ["www-authenticate", "1, 2, 3, 4", "headers-www-authenticate"],
+].forEach(testValues => {
+  promise_test(async t => {
+    const response = await fetch("../../../xhr/resources/" + testValues[2] + ".asis");
+    assert_equals(response.headers.get(testValues[0]), testValues[1]);
+  }, "response.headers.get('" + testValues[0] + "') expects " + testValues[1]);
+});

test/wpt/tests/xhr/resources/header-content-length-twice.asis

@@ -0,0 +1,3 @@
+HTTP/1.0 200 NANANA
+CONTENT-LENGTH:  0
+content-length:	 0

test/wpt/tests/xhr/resources/header-content-length.asis

@@ -0,0 +1,2 @@
+HTTP/1.0 200 NANANA
+CONTENT-LENGTH:  0

test/wpt/tests/xhr/resources/headers-basic.asis

@@ -0,0 +1,4 @@
+HTTP/1.1 280 HELLO
+foo-test: 1
+foo-test: 2
+foo-test: 3

test/wpt/tests/xhr/resources/headers-double-empty.asis

@@ -0,0 +1,3 @@
+HTTP/1.1 444 HI
+double-trouble:
+double-trouble:

test/wpt/tests/xhr/resources/headers-some-are-empty.asis

@@ -0,0 +1,7 @@
+HTTP/1.0 200 MEH
+HEYA:	 
+HEYA: 
+HEYA: 1	
+HEYA:
+HEYA:	
+HEYA: 	2