diff options
-rw-r--r-- | .dprint.json | 7 | ||||
-rwxr-xr-x | .github/workflows/ci.generate.ts | 9 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 5 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | ext/websocket/autobahn/autobahn_server.js | 20 | ||||
-rw-r--r-- | ext/websocket/autobahn/fuzzingclient.js | 33 | ||||
-rw-r--r-- | ext/websocket/autobahn/fuzzingclient.json | 26 |
7 files changed, 2 insertions, 100 deletions
diff --git a/.dprint.json b/.dprint.json index 51a52d881..d20b1673b 100644 --- a/.dprint.json +++ b/.dprint.json @@ -13,9 +13,7 @@ "associations": "**/*.rs", "rustfmt": "rustfmt --config imports_granularity=item" }, - "includes": [ - "**/*.{ts,tsx,js,jsx,json,md,toml,rs}" - ], + "includes": ["**/*.{ts,tsx,js,jsx,json,md,toml,rs}"], "excludes": [ ".cargo_home", ".git", @@ -50,8 +48,7 @@ "tools/node_compat/TODO.md", "tools/node_compat/versions", "tools/wpt/expectation.json", - "tools/wpt/manifest.json", - "ext/websocket/autobahn/reports" + "tools/wpt/manifest.json" ], "plugins": [ "https://plugins.dprint.dev/typescript-0.84.0.wasm", diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index af212cd47..41abf1737 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -643,15 +643,6 @@ const ci = { 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/', }, { - name: "Autobahn testsuite", - if: [ - "matrix.job == 'test' && matrix.profile == 'release' &&", - "!startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu')", - ].join("\n"), - run: - "target/release/deno run -A --unstable ext/websocket/autobahn/fuzzingclient.js", - }, - { name: "Test debug", if: [ "matrix.job == 'test' && matrix.profile == 'debug' &&", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc9c709e9..c70590d61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -399,11 +399,6 @@ jobs: env: CLOUDSDK_PYTHON: '${{env.pythonLocation}}\python.exe' run: 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/' - - name: Autobahn testsuite - if: |- - !(github.event_name == 'pull_request' && matrix.skip_pr) && (matrix.job == 'test' && matrix.profile == 'release' && - !startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'ubuntu')) - run: target/release/deno run -A --unstable ext/websocket/autobahn/fuzzingclient.js - name: Test debug if: |- !(github.event_name == 'pull_request' && matrix.skip_pr) && (matrix.job == 'test' && matrix.profile == 'debug' && diff --git a/.gitignore b/.gitignore index a8738ea41..6f806b143 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ gclient_config.py_entries # WPT generated cert files /tools/wpt/certs/index.txt* /tools/wpt/certs/serial* - -/ext/websocket/autobahn/reports diff --git a/ext/websocket/autobahn/autobahn_server.js b/ext/websocket/autobahn/autobahn_server.js deleted file mode 100644 index c678dfc1a..000000000 --- a/ext/websocket/autobahn/autobahn_server.js +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. -import { parse } from "../../../test_util/std/flags/mod.ts"; - -const { port } = parse(Deno.args, { - number: ["port"], - default: { - port: 6969, - }, -}); - -const { serve } = Deno; - -// A message-based WebSocket echo server. -serve((request) => { - const { socket, response } = Deno.upgradeWebSocket(request); - socket.onmessage = (event) => { - socket.send(event.data); - }; - return response; -}, { port }); diff --git a/ext/websocket/autobahn/fuzzingclient.js b/ext/websocket/autobahn/fuzzingclient.js deleted file mode 100644 index 8aa716695..000000000 --- a/ext/websocket/autobahn/fuzzingclient.js +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. - -// deno-lint-ignore-file - -import { $ } from "https://deno.land/x/dax@0.31.0/mod.ts"; - -const pwd = new URL(".", import.meta.url).pathname; - -const AUTOBAHN_TESTSUITE_DOCKER = - "crossbario/autobahn-testsuite:0.8.2@sha256:5d4ba3aa7d6ab2fdbf6606f3f4ecbe4b66f205ce1cbc176d6cdf650157e52242"; - -const self = Deno.execPath(); -$`${self} run -A --unstable ${pwd}/autobahn_server.js`.spawn(); -await $`docker run --name fuzzingserver -v ${pwd}/fuzzingclient.json:/fuzzingclient.json:ro -v ${pwd}/reports:/reports -p 9001:9001 --net=host --rm ${AUTOBAHN_TESTSUITE_DOCKER} wstest -m fuzzingclient -s fuzzingclient.json` - .cwd(pwd); - -const { deno_websocket } = JSON.parse( - Deno.readTextFileSync(`${pwd}/reports/servers/index.json`), -); -const result = Object.values(deno_websocket); - -function failed(name) { - return name != "OK" && name != "INFORMATIONAL" && name != "NON-STRICT"; -} - -const failedtests = result.filter((outcome) => failed(outcome.behavior)); - -console.log( - `%c${result.length - failedtests.length} / ${result.length} tests OK`, - `color: ${failedtests.length == 0 ? "green" : "red"}`, -); - -Deno.exit(failedtests.length == 0 ? 0 : 1); diff --git a/ext/websocket/autobahn/fuzzingclient.json b/ext/websocket/autobahn/fuzzingclient.json deleted file mode 100644 index fcee80c99..000000000 --- a/ext/websocket/autobahn/fuzzingclient.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "outdir": "./reports/servers", - "servers": [ - { - "agent": "deno_websocket", - "url": "ws://localhost:6969" - } - ], - "cases": [ - "1.*", - "2.*", - "3.*", - "4.*", - "5.*", - "6.*", - "7.*", - "9.*", - "10.*" - ], - "exclude-cases": [ - "11.*", - "12.*", - "13.*" - ], - "exclude-agent-cases": {} -} |