6 files changed, 16 insertions, 37 deletions
diff --git a/tests/wasm/chan_test.go b/tests/wasm/chan_test.go
index e44d7ebe4..fe981974c 100644
--- a/tests/wasm/chan_test.go
+++ b/tests/wasm/chan_test.go
@@ -2,23 +2,20 @@ package wasm
 
 import (
 	"testing"
-	"time"
 
 	"github.com/chromedp/chromedp"
 )
 
 func TestChan(t *testing.T) {
 
-	t.Parallel()
-
 	wasmTmpDir, server := startServer(t)
 
-	err := run("tinygo build -o " + wasmTmpDir + "/chan.wasm -target wasm testdata/chan.go")
+	err := run(t, "tinygo build -o "+wasmTmpDir+"/chan.wasm -target wasm testdata/chan.go")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx(5 * time.Second)
+	ctx, cancel := chromectx()
 	defer cancel()
 
 	err = chromedp.Run(ctx,
diff --git a/tests/wasm/event_test.go b/tests/wasm/event_test.go
index 038a500a3..a29a01c7e 100644
--- a/tests/wasm/event_test.go
+++ b/tests/wasm/event_test.go
@@ -2,35 +2,30 @@ package wasm
 
 import (
 	"testing"
-	"time"
 
 	"github.com/chromedp/chromedp"
 )
 
 func TestEvent(t *testing.T) {
 
-	t.Parallel()
-
 	wasmTmpDir, server := startServer(t)
 
-	err := run("tinygo build -o " + wasmTmpDir + "/event.wasm -target wasm testdata/event.go")
+	err := run(t, "tinygo build -o "+wasmTmpDir+"/event.wasm -target wasm testdata/event.go")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx(5 * time.Second)
+	ctx, cancel := chromectx()
 	defer cancel()
 
 	var log1, log2 string
 	err = chromedp.Run(ctx,
 		chromedp.Navigate(server.URL+"/run?file=event.wasm"),
 		chromedp.WaitVisible("#log"),
-		chromedp.Sleep(time.Second),
 		chromedp.InnerHTML("#log", &log1),
 		waitLog(`1
 4`),
 		chromedp.Click("#testbtn"),
-		chromedp.Sleep(time.Second),
 		chromedp.InnerHTML("#log", &log2),
 		waitLog(`1
 4
diff --git a/tests/wasm/fmt_test.go b/tests/wasm/fmt_test.go
index f9f2f77b1..d3695f072 100644
--- a/tests/wasm/fmt_test.go
+++ b/tests/wasm/fmt_test.go
@@ -2,29 +2,25 @@ package wasm
 
 import (
 	"testing"
-	"time"
 
 	"github.com/chromedp/chromedp"
 )
 
 func TestFmt(t *testing.T) {
 
-	t.Parallel()
-
 	wasmTmpDir, server := startServer(t)
 
-	err := run("tinygo build -o " + wasmTmpDir + "/fmt.wasm -target wasm testdata/fmt.go")
+	err := run(t, "tinygo build -o "+wasmTmpDir+"/fmt.wasm -target wasm testdata/fmt.go")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx(5 * time.Second)
+	ctx, cancel := chromectx()
 	defer cancel()
 
 	var log1 string
 	err = chromedp.Run(ctx,
 		chromedp.Navigate(server.URL+"/run?file=fmt.wasm"),
-		chromedp.Sleep(time.Second),
 		chromedp.InnerHTML("#log", &log1),
 		waitLog(`did not panic`),
 	)
diff --git a/tests/wasm/fmtprint_test.go b/tests/wasm/fmtprint_test.go
index 90825ba08..3c7502399 100644
--- a/tests/wasm/fmtprint_test.go
+++ b/tests/wasm/fmtprint_test.go
@@ -2,29 +2,25 @@ package wasm
 
 import (
 	"testing"
-	"time"
 
 	"github.com/chromedp/chromedp"
 )
 
 func TestFmtprint(t *testing.T) {
 
-	t.Parallel()
-
 	wasmTmpDir, server := startServer(t)
 
-	err := run("tinygo build -o " + wasmTmpDir + "/fmtprint.wasm -target wasm testdata/fmtprint.go")
+	err := run(t, "tinygo build -o "+wasmTmpDir+"/fmtprint.wasm -target wasm testdata/fmtprint.go")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx(5 * time.Second)
+	ctx, cancel := chromectx()
 	defer cancel()
 
 	var log1 string
 	err = chromedp.Run(ctx,
 		chromedp.Navigate(server.URL+"/run?file=fmtprint.wasm"),
-		chromedp.Sleep(time.Second),
 		chromedp.InnerHTML("#log", &log1),
 		waitLog(`test from fmtprint 1
 test from fmtprint 2
diff --git a/tests/wasm/log_test.go b/tests/wasm/log_test.go
index fae4c670b..1f6c79fe9 100644
--- a/tests/wasm/log_test.go
+++ b/tests/wasm/log_test.go
@@ -2,29 +2,25 @@ package wasm
 
 import (
 	"testing"
-	"time"
 
 	"github.com/chromedp/chromedp"
 )
 
 func TestLog(t *testing.T) {
 
-	t.Parallel()
-
 	wasmTmpDir, server := startServer(t)
 
-	err := run("tinygo build -o " + wasmTmpDir + "/log.wasm -target wasm testdata/log.go")
+	err := run(t, "tinygo build -o "+wasmTmpDir+"/log.wasm -target wasm testdata/log.go")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ctx, cancel := chromectx(5 * time.Second)
+	ctx, cancel := chromectx()
 	defer cancel()
 
 	var log1 string
 	err = chromedp.Run(ctx,
 		chromedp.Navigate(server.URL+"/run?file=log.wasm"),
-		chromedp.Sleep(time.Second),
 		chromedp.InnerHTML("#log", &log1),
 		waitLogRe(`^..../../.. ..:..:.. log 1
 ..../../.. ..:..:.. log 2
diff --git a/tests/wasm/setup_test.go b/tests/wasm/setup_test.go
index 0071076c2..e5a18daf7 100644
--- a/tests/wasm/setup_test.go
+++ b/tests/wasm/setup_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
 	"net/http"
 	"net/http/httptest"
 	"os/exec"
@@ -18,29 +17,29 @@ import (
 	"github.com/chromedp/chromedp"
 )
 
-func run(cmdline string) error {
+func run(t *testing.T, cmdline string) error {
 	args := strings.Fields(cmdline)
-	return runargs(args...)
+	return runargs(t, args...)
 }
 
-func runargs(args ...string) error {
+func runargs(t *testing.T, args ...string) error {
 	cmd := exec.Command(args[0], args[1:]...)
 	b, err := cmd.CombinedOutput()
-	log.Printf("Command: %s; err=%v; full output:\n%s", strings.Join(args, " "), err, b)
+	t.Logf("Command: %s; err=%v; full output:\n%s", strings.Join(args, " "), err, b)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func chromectx(timeout time.Duration) (context.Context, context.CancelFunc) {
+func chromectx() (context.Context, context.CancelFunc) {
 
 	var ctx context.Context
 
 	// looks for locally installed Chrome
 	ctx, _ = chromedp.NewContext(context.Background())
 
-	ctx, cancel := context.WithTimeout(ctx, timeout)
+	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 
 	return ctx, cancel
 }