wip

accept.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

accept_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

autobahn_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket_test
@@ -33,6 +34,12 @@ var excludedAutobahnCases = []string{
 
 var autobahnCases = []string{"*"}
 
+// Used to run individual test cases. autobahnCases runs only those cases matched
+// and not excluded by excludedAutobahnCases. Adding cases here means excludedAutobahnCases
+// is niled.
+// TODO:
+var forceAutobahnCases = []string{}
+
 func TestAutobahn(t *testing.T) {
 	t.Parallel()
 
@@ -43,11 +50,11 @@ func TestAutobahn(t *testing.T) {
 	if os.Getenv("AUTOBAHN") == "fast" {
 		// These are the slow tests.
 		excludedAutobahnCases = append(excludedAutobahnCases,
-			"9.*", "13.*", "12.*",
+			"9.*", "12.*", "13.*",
 		)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*15)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Hour)
 	defer cancel()
 
 	wstestURL, closeFn, err := wstestClientServer(ctx)
@@ -105,45 +112,63 @@ func wstestClientServer(ctx context.Context) (url string, closeFn func(), err er
 	if err != nil {
 		return "", nil, err
 	}
+	_, serverPort, err := net.SplitHostPort(serverAddr)
+	if err != nil {
+		return "", nil, err
+	}
 
 	url = "ws://" + serverAddr
+	const outDir = "ci/out/wstestClientReports"
 
 	specFile, err := tempJSONFile(map[string]interface{}{
 		"url":           url,
-		"outdir":        "ci/out/wstestClientReports",
+		"outdir":        outDir,
 		"cases":         autobahnCases,
 		"exclude-cases": excludedAutobahnCases,
 	})
 	if err != nil {
 		return "", nil, fmt.Errorf("failed to write spec: %w", err)
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*15)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Hour)
 	defer func() {
 		if err != nil {
 			cancel()
 		}
 	}()
 
+	wd, err := os.Getwd()
+	if err != nil {
+		return "", nil, err
+	}
+
 	var args []string
-	args = append(args, "run", "-it", "--rm",
-    -v "${PWD}/config:/specFile", \
-    -v "${PWD}/reports:/reports", \
-    "-p=9001:9001", \
-    "--name=fuzzingserver", \
-    "crossbario/autobahn-testsuite",
+	args = append(args, "run", "-i", "--rm",
+		"-v", fmt.Sprintf("%s:%[1]s", specFile),
+		"-v", fmt.Sprintf("%s/ci:/ci", wd),
+		fmt.Sprintf("-p=%s:%s", serverAddr, serverPort),
+		"--name=fuzzingserver",
+		"crossbario/autobahn-testsuite",
+	)
 	args = append(args, "wstest", "--mode", "fuzzingserver", "--spec", specFile,
 		// Disables some server that runs as part of fuzzingserver mode.
 		// See https://github.com/crossbario/autobahn-testsuite/blob/058db3a36b7c3a1edf68c282307c6b899ca4857f/autobahntestsuite/autobahntestsuite/wstest.py#L124
 		"--webport=0",
 	)
+	fmt.Println(strings.Join(args, " "))
+	// TODO: pull image in advance
 	wstest := exec.CommandContext(ctx, "docker", args...)
+	// TODO: log to *testing.T
+	wstest.Stdout = os.Stdout
+	wstest.Stderr = os.Stderr
 	err = wstest.Start()
 	if err != nil {
 		return "", nil, fmt.Errorf("failed to start wstest: %w", err)
 	}
 
+	// TODO: kill
 	return url, func() {
+		// TODO: super kill
 		wstest.Process.Kill()
 	}, nil
 }

close.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

close_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

compress.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

compress_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

conn.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

conn_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket_test

dial.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

dial_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

doc.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 // Package websocket implements the RFC 6455 WebSocket protocol.
@@ -16,7 +17,7 @@
 //
 // More documentation at https://nhooyr.io/websocket.
 //
-// Wasm
+// # Wasm
 //
 // The client side supports compiling to Wasm.
 // It wraps the WebSocket browser API.
@@ -25,8 +26,8 @@
 //
 // Some important caveats to be aware of:
 //
-//  - Accept always errors out
-//  - Conn.Ping is no-op
-//  - HTTPClient, HTTPHeader and CompressionMode in DialOptions are no-op
-//  - *http.Response from Dial is &http.Response{} with a 101 status code on success
+//   - Accept always errors out
+//   - Conn.Ping is no-op
+//   - HTTPClient, HTTPHeader and CompressionMode in DialOptions are no-op
+//   - *http.Response from Dial is &http.Response{} with a 101 status code on success
 package websocket // import "nhooyr.io/websocket"

export_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

frame_test.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

internal/test/wstest/echo.go

@@ -21,7 +21,7 @@ func EchoLoop(ctx context.Context, c *websocket.Conn) error {
 
 	c.SetReadLimit(1 << 30)
 
-	ctx, cancel := context.WithTimeout(ctx, time.Minute)
+	ctx, cancel := context.WithTimeout(ctx, time.Minute*5)
 	defer cancel()
 
 	b := make([]byte, 32<<10)

internal/test/wstest/pipe.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package wstest

internal/wsjs/wsjs_js.go

@@ -1,3 +1,4 @@
+//go:build js
 // +build js
 
 // Package wsjs implements typed access to the browser javascript WebSocket API.

make.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -eu
+
+cd "$(dirname "$0")"
+
+fmt() {
+	go mod tidy
+	gofmt -s -w .
+	goimports -w "-local=$(go list -m)" .
+}
+
+if ! command -v wasmbrowsertest >/dev/null; then
+	go install github.com/agnivade/wasmbrowsertest@latest
+fi
+
+fmt
+#AUTOBAHN=1 go test -race --timeout=1h ./... "$@"

read.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket

write.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package websocket