Improve tests (#513)

Author: jwierzbo

Dockerfile.debug

@@ -1,4 +1,5 @@
-FROM golang:1.19.4 as builder
+ARG GOVERSION
+FROM golang:${GOVERSION} as builder
 
 ARG TESTS_DIRECTORY
 ARG TESTS_ROOT_PATH="."

Makefile

@@ -434,12 +434,12 @@ __test_v2_go_test:
 
 __test_debug__:
 ifeq ("$(DEBUG)", "true")
-	@docker build -f Dockerfile.debug --build-arg "TESTS_DIRECTORY=./test" -t $(GOIMAGE) .
+	@docker build -f Dockerfile.debug --build-arg GOVERSION=$(GOVERSION) --build-arg "TESTS_DIRECTORY=./test" -t $(GOIMAGE) .
 endif
 
 __test_v2_debug__:
 ifeq ("$(DEBUG)", "true")
-	@docker build -f Dockerfile.debug --build-arg "TESTS_DIRECTORY=./tests" --build-arg "TESTS_ROOT_PATH=v2" -t $(GOIMAGE) .
+	@docker build -f Dockerfile.debug --build-arg GOVERSION=$(GOVERSION) --build-arg "TESTS_DIRECTORY=./tests" --build-arg "TESTS_ROOT_PATH=v2" -t $(GOIMAGE) .
 endif
 
 __dir_setup:

client_server_info_impl.go

@@ -140,6 +140,13 @@ func (c *client) echo(ctx context.Context) error {
 	if err != nil {
 		return WithStack(err)
 	}
+
+	// Velocypack requires non-empty body for versions < 3.11.
+	req, err = req.SetBody("echo")
+	if err != nil {
+		return WithStack(err)
+	}
+
 	applyContextSettings(ctx, req)
 	resp, err := c.conn.Do(ctx, req)
 	if err != nil {

test/database_test.go

@@ -208,7 +208,7 @@ func TestDatabaseNameUnicode(t *testing.T) {
 func TestCreateDatabaseReplication2(t *testing.T) {
 	ctx := context.Background()
 	c := createClientFromEnv(t, true)
-	EnsureVersion(t, ctx, c).CheckVersion(MinimumVersion("3.12.0"))
+	EnsureVersion(t, ctx, c).CheckVersion(MinimumVersion("3.12.0")).Cluster()
 
 	name := "create_test_replication2"
 	opts := driver.CreateDatabaseOptions{Options: driver.CreateDatabaseDefaultOptions{

v2/arangodb/client_server_info_impl.go

@@ -22,7 +22,6 @@ package arangodb
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 
 	"github.com/arangodb/go-driver/v2/arangodb/shared"
@@ -128,7 +127,6 @@ func (c clientServerInfo) ServerRole(ctx context.Context) (ServerRole, error) {
 		return role, nil
 	}
 
-	fmt.Println(response.Mode)
 	if response.Mode != "resilient" {
 		// Single server mode.
 		return role, nil
@@ -154,7 +152,8 @@ func (c clientServerInfo) echo(ctx context.Context) error {
 		shared.ResponseStruct `json:",inline"`
 	}
 
-	resp, err := connection.CallGet(ctx, c.client.connection, url, &response)
+	// Velocypack requires non-empty body for versions < 3.11.
+	resp, err := connection.CallGet(ctx, c.client.connection, url, &response, connection.WithBody("echo"))
 	if err != nil {
 		return errors.WithStack(err)
 	}

v2/tests/client_server_info_test.go

@@ -30,10 +30,10 @@ import (
 	"github.com/arangodb/go-driver/v2/arangodb"
 )
 
-// Test_ServerRole tests server role for all instances.
+// Test_ServerRole tests a server role for all instances.
 func Test_ServerRole(t *testing.T) {
 	Wrap(t, func(t *testing.T, client arangodb.Client) {
-		withContext(time.Second*10, func(ctx context.Context) error {
+		withContextT(t, 10*time.Second, func(ctx context.Context, _ testing.TB) {
 			testMode := getTestMode()
 
 			t.Run("user endpoint", func(t *testing.T) {
@@ -48,8 +48,6 @@ func Test_ServerRole(t *testing.T) {
 					require.Equal(t, role, arangodb.ServerRoleSingleActive)
 				}
 			})
-
-			return nil
 		})
 	})
 }

v2/tests/database_transactions_test.go

@@ -250,7 +250,7 @@ func Test_DatabaseTransactions_DocumentLock(t *testing.T) {
 
 func Test_DatabaseTransactions_List(t *testing.T) {
 	Wrap(t, func(t *testing.T, client arangodb.Client) {
-		withContextT(t, 30*time.Second, func(ctx context.Context, _ testing.TB) {
+		withContextT(t, 60*time.Second, func(ctx context.Context, _ testing.TB) {
 			WithDatabase(t, client, nil, func(db arangodb.Database) {
 				t.Run("List all transactions", func(t *testing.T) {
 					t1, err := db.BeginTransaction(ctx, arangodb.TransactionCollections{}, nil)