require: finish package tests/python

tests/python/method_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 

tests/python/namespace_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 
@@ -18,19 +17,16 @@ func TestNamespace(t *testing.T) {
 	defer srv.Close()
 
 	c, err := opcua.NewClient(srv.Endpoint, srv.Opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := c.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewClient failed")
+
+	err = c.Connect(ctx)
+	require.NoError(t, err, "Connect failed")
 	defer c.Close(ctx)
 
 	t.Run("NamespaceArray", func(t *testing.T) {
 		got, err := c.NamespaceArray(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err, "NamespaceArray failed")
+
 		want := []string{
 			"http://opcfoundation.org/UA/",
 			"urn:freeopcua:python:server",
@@ -40,17 +36,11 @@ func TestNamespace(t *testing.T) {
 	})
 	t.Run("FindNamespace", func(t *testing.T) {
 		ns, err := c.FindNamespace(ctx, "http://gopcua.com/")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got, want := ns, uint16(2); got != want {
-			t.Fatalf("got namespace id %d want %d", got, want)
-		}
+		require.NoError(t, err, "FindNamespace failed")
+		require.Equal(t, uint16(2), ns, "namespace id not equal")
 	})
 	t.Run("UpdateNamespaces", func(t *testing.T) {
 		err := c.UpdateNamespaces(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err, "UpdateNamespaces failed")
 	})
 }

tests/python/py_server.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 

tests/python/read_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 

tests/python/read_unknow_node_id_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 
@@ -10,6 +9,7 @@ import (
 	"github.com/gopcua/opcua"
 	"github.com/gopcua/opcua/id"
 	"github.com/gopcua/opcua/ua"
+	"github.com/stretchr/testify/require"
 )
 
 // TestRead performs an integration test to read values
@@ -21,12 +21,10 @@ func TestReadUnknowNodeID(t *testing.T) {
 	defer srv.Close()
 
 	c, err := opcua.NewClient(srv.Endpoint, srv.Opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := c.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewClient failed")
+
+	err = c.Connect(ctx)
+	require.NoError(t, err, "Connect failed")
 	defer c.Close(ctx)
 
 	// read node with unknown extension object
@@ -37,13 +35,9 @@ func TestReadUnknowNodeID(t *testing.T) {
 			{NodeID: nodeWithUnknownType},
 		},
 	})
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "Read failed")
 
-	if got, want := resp.Results[0].Status, ua.StatusBadDataTypeIDUnknown; got != want {
-		t.Errorf("got status %v want %v for a node with an unknown type", got, want)
-	}
+	require.Equal(t, ua.StatusBadDataTypeIDUnknown, resp.Results[0].Status, "got different status for a node with an unknown type")
 
 	// check that the connection is still usable by reading another node.
 	_, err = c.Read(ctx, &ua.ReadRequest{
@@ -53,7 +47,5 @@ func TestReadUnknowNodeID(t *testing.T) {
 			},
 		},
 	})
-	if err != nil {
-		t.Error(err)
-	}
+	require.NoError(t, err, "Read failed")
 }

tests/python/reconnection_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 
@@ -11,6 +10,7 @@ import (
 	"github.com/gopcua/opcua"
 	"github.com/gopcua/opcua/monitor"
 	"github.com/gopcua/opcua/ua"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -28,18 +28,14 @@ func TestAutoReconnection(t *testing.T) {
 	defer srv.Close()
 
 	c, err := opcua.NewClient(srv.Endpoint, srv.Opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := c.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewClient failed")
+
+	err = c.Connect(ctx)
+	require.NoError(t, err, "Connect failed")
 	defer c.Close(ctx)
 
 	m, err := monitor.NewNodeMonitor(c)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewNodeMonitor failed")
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -92,17 +88,14 @@ func TestAutoReconnection(t *testing.T) {
 		ch,
 		currentTimeNodeID,
 	)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "ChanSubscribe failed")
 	defer sub.Unsubscribe(ctx)
 
 	for _, tt := range tests {
 		ok := t.Run(tt.name, func(t *testing.T) {
 
-			if msg := <-ch; msg.Error != nil {
-				t.Fatalf("No error expected for first value: %s", msg.Error)
-			}
+			msg := <-ch
+			require.NoError(t, msg.Error, "No error expected for first value")
 
 			downC := make(chan struct{}, 1)
 			dTimeout := time.NewTimer(disconnectTimeout)
@@ -132,7 +125,7 @@ func TestAutoReconnection(t *testing.T) {
 			select {
 			case <-dTimeout.C:
 				cancel()
-				t.Fatal("Timeout reached, the connection did not go down as expected")
+				require.Fail(t, "Timeout reached, the connection did not go down as expected")
 			case <-downC:
 			}
 
@@ -144,16 +137,14 @@ func TestAutoReconnection(t *testing.T) {
 			rTimeout := time.NewTimer(reconnectionTimeout)
 			select {
 			case <-rTimeout.C:
-				t.Fatal("Timeout reached, reconnection failed")
+				require.Fail(t, "Timeout reached, reconnection failed")
 			case msg := <-ch:
-				if err := msg.Error; err != nil {
-					t.Fatal(err)
-				}
+				require.NoError(t, msg.Error)
 			}
 		})
 
 		if !ok {
-			t.FailNow()
+			require.Fail(t)
 		}
 	}
 }

tests/python/stats_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 

tests/python/timeout_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 
@@ -11,6 +10,7 @@ import (
 
 	"github.com/gopcua/opcua"
 	"github.com/gopcua/opcua/errors"
+	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -22,18 +22,13 @@ const (
 
 func TestClientTimeoutViaOptions(t *testing.T) {
 	c, err := opcua.NewClient(tcpNoRstTestServer, opcua.DialTimeout(forceTimeoutDuration))
-	if err != nil {
-		t.Fatal(err)
-	}
-
+	require.NoError(t, err, "NewClient failed")
 	connectAndValidate(t, c, context.Background(), forceTimeoutDuration)
 }
 
 func TestClientTimeoutViaContext(t *testing.T) {
 	c, err := opcua.NewClient(tcpNoRstTestServer)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewClient failed")
 
 	ctx, cancel := context.WithTimeout(context.Background(), forceTimeoutDuration)
 	defer cancel()
@@ -45,26 +40,24 @@ func connectAndValidate(t *testing.T, c *opcua.Client, ctx context.Context, d ti
 	start := time.Now()
 
 	err := c.Connect(ctx)
-	if err == nil {
-		t.Fatal("err should not be nil")
-	}
+	require.Error(t, err, "Connect should fail")
 
 	elapsed := time.Since(start)
 
 	var oe *net.OpError
 	switch {
 	case errors.As(err, &oe) && !oe.Timeout():
-		t.Fatalf("got %#v, wanted net.timeoutError", oe.Unwrap())
+		require.Fail(t, "got %#v, wanted net.timeoutError", oe.Unwrap())
 	case errors.As(err, &oe):
 		// ignore
 	default:
-		t.Fatalf("got %T, wanted %T", err, &net.OpError{})
+		require.Fail(t, "got %T, wanted %T", err, &net.OpError{})
 	}
 
 	pct := 0.05
 
 	if !within(elapsed, d, pct) {
-		t.Fatalf("took %s, expected %s +/- %v%%", elapsed, d, pct*100)
+		require.Fail(t, "took %s, expected %s +/- %v%%", elapsed, d, pct*100)
 	}
 }
 

tests/python/write_test.go

@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package uatest
 
@@ -9,6 +8,7 @@ import (
 
 	"github.com/gopcua/opcua"
 	"github.com/gopcua/opcua/ua"
+	"github.com/stretchr/testify/require"
 )
 
 // TestWrite performs an integration test to first write
@@ -33,12 +33,10 @@ func TestWrite(t *testing.T) {
 	defer srv.Close()
 
 	c, err := opcua.NewClient(srv.Endpoint, srv.Opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := c.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err, "NewClient failed")
+
+	err = c.Connect(ctx)
+	require.NoError(t, err, "Connect failed")
 	defer c.Close(ctx)
 
 	for _, tt := range tests {
@@ -70,10 +68,6 @@ func testWrite(t *testing.T, ctx context.Context, c *opcua.Client, status ua.Sta
 	t.Helper()
 
 	resp, err := c.Write(ctx, req)
-	if err != nil {
-		t.Fatalf("Write failed: %s", err)
-	}
-	if got, want := resp.Results[0], status; got != want {
-		t.Fatalf("got status %v want %v", got, want)
-	}
+	require.NoError(t, err, "Write failed")
+	require.Equal(t, status, resp.Results[0], "Write result not equal")
 }