[Test] Add more verbose (#325)

Author: ajanikow

Makefile

@@ -360,6 +360,7 @@ __test_go_test:
 		-e TEST_BACKUP_REMOTE_CONFIG='$(TEST_BACKUP_REMOTE_CONFIG)' \
 		-e TEST_DEBUG='$(TEST_DEBUG)' \
 		-e TEST_ENABLE_SHUTDOWN=$(TEST_ENABLE_SHUTDOWN) \
+		-e TEST_REQUEST_LOG=$(TEST_REQUEST_LOG) \
 		-e GODEBUG=tls13=1 \
 		-e CGO_ENABLED=$(CGO_ENABLED) \
 		-w /usr/code/ \

http/response_json.go

@@ -49,6 +49,7 @@ func (r *httpJSONResponse) StatusCode() int {
 func (r *httpJSONResponse) Endpoint() string {
 	u := *r.resp.Request.URL
 	u.Path = ""
+	u.RawQuery = ""
 	return u.String()
 }
 

http/response_vpack.go

@@ -47,6 +47,7 @@ func (r *httpVPackResponse) StatusCode() int {
 func (r *httpVPackResponse) Endpoint() string {
 	u := *r.resp.Request.URL
 	u.Path = ""
+	u.RawQuery = ""
 	return u.String()
 }
 

test/backup_test.go

@@ -18,6 +18,7 @@
 // Copyright holder is ArangoDB GmbH, Cologne, Germany
 //
 // Author Ewout Prangsma
+// Author Adam Janikowski
 //
 
 package test
@@ -33,8 +34,6 @@ import (
 	"time"
 
 	driver "github.com/arangodb/go-driver"
-
-	errors "github.com/pkg/errors"
 )
 
 var backupAPIAvailable *bool
@@ -344,40 +343,34 @@ func TestBackupDeleteNonExisting(t *testing.T) {
 	}
 }
 
-func waitForServerRestart(ctx context.Context, c driver.Client, t *testing.T) {
+func waitForServerRestart(ctx context.Context, c driver.Client, t *testing.T) driver.Client {
+	// Wait for server to go down
+	newRetryFunc(func() error {
+		c = createClientFromEnv(t, false)
+		nCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+		defer cancel()
 
-	serverWasDown := false
+		if _, err := c.Version(nCtx); err != nil {
+			return interrupt{}
+		}
 
-	saveDriver := driver.WithStack
-	driver.WithStack = errors.WithStack
+		return nil
+	}).RetryT(t, 100*time.Millisecond, 15*time.Second)
 
-	for {
-		vctx, cancel := context.WithTimeout(ctx, 50*time.Millisecond)
-		if _, err := c.Version(vctx); err != nil {
-			fmt.Printf("Error Response: %v\n", err)
-			fmt.Printf("Error Response: %+v\n", err)
-			serverWasDown = true
-		} else {
-			if serverWasDown {
-				fmt.Print("Leaving successfully\n")
-				cancel()
-				driver.WithStack = saveDriver
-				return
-			}
-		}
+	// Wait for secret to start
+	newRetryFunc(func() error {
+		c = createClientFromEnv(t, false)
+		nCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+		defer cancel()
 
-		cancel()
-		select {
-		case <-ctx.Done():
-			fmt.Print("Context cancelled\n")
-			driver.WithStack = saveDriver
-			return
-		case <-time.After(1 * time.Second):
-			//fmt.Print("After 1 second\n")
-			break
+		if _, err := c.Version(nCtx); err == nil {
+			return interrupt{}
 		}
-	}
 
+		return nil
+	}).RetryT(t, 100*time.Millisecond, 15*time.Second)
+
+	return c
 }
 
 func TestBackupRestore(t *testing.T) {
@@ -432,7 +425,7 @@ func TestBackupRestore(t *testing.T) {
 	if isSingle {
 		waitctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 		defer cancel()
-		waitForServerRestart(waitctx, c, t)
+		c = waitForServerRestart(waitctx, c, t)
 	}
 
 	if ok, err := col.DocumentExists(ctx, meta1.Key); err != nil {
@@ -683,7 +676,7 @@ func TestBackupCompleteCycle(t *testing.T) {
 	if isSingle {
 		waitctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 		defer cancel()
-		waitForServerRestart(waitctx, c, t)
+		c = waitForServerRestart(waitctx, c, t)
 	}
 
 	if ok, err := col.DocumentExists(ctx, meta1.Key); err != nil {
@@ -803,7 +796,7 @@ func TestBackupCreateRestoreParallel(t *testing.T) {
 			if isSingle {
 				waitctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 				defer cancel()
-				waitForServerRestart(waitctx, c, t)
+				c = waitForServerRestart(waitctx, c, t)
 			}
 		} else {
 			errchan <- err
@@ -901,7 +894,7 @@ func TestBackupRestoreWithViews(t *testing.T) {
 	if isSingle {
 		waitctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 		defer cancel()
-		waitForServerRestart(waitctx, c, t)
+		c = waitForServerRestart(waitctx, c, t)
 	}
 
 	t.Run("immediate", func(t *testing.T) {

test/client_test.go

@@ -208,11 +208,8 @@ func createClientFromEnv(t testEnv, waitUntilReady bool) driver.Client {
 	})
 
 	conn := createConnectionFromEnv(t)
-	if os.Getenv("TEST_DEBUG") != "" {
-		file, err := os.OpenFile("./test.log", os.O_CREATE|os.O_RDWR, 0666)
-		require.NoError(t, err)
-		l := zerolog.New(file).With().Str("Test", t.Name()).Logger()
-		conn = wrappers.NewLoggerConnection(conn, wrappers.NewZeroLogLogger(l), true)
+	if os.Getenv("TEST_REQUEST_LOG") != "" {
+		conn = WrapLogger(t, conn)
 	}
 
 	c, err := driver.NewClient(driver.ClientConfig{

test/wrapper_test.go

@@ -0,0 +1,84 @@
+//
+// DISCLAIMER
+//
+// Copyright 2021 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Adam Janikowski
+//
+
+package test
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"github.com/arangodb/go-driver"
+)
+
+func WrapLogger(t testEnv, c driver.Connection) driver.Connection {
+	return &logWrapper{
+		t: t,
+		c: c,
+	}
+}
+
+type logWrapper struct {
+	t testEnv
+
+	c driver.Connection
+}
+
+func (l logWrapper) NewRequest(method, path string) (driver.Request, error) {
+	return l.c.NewRequest(method, path)
+}
+
+func (l logWrapper) Do(ctx context.Context, req driver.Request) (driver.Response, error) {
+	t := time.Now()
+
+	if resp, err := l.c.Do(ctx, req); err != nil {
+		l.t.Logf("Request (UNKNOWN)\t%s\t%s (%s): Failed %s", strings.ToUpper(req.Method()), req.Path(), time.Now().Sub(t).String(), err.Error())
+		return resp, err
+	} else {
+		l.t.Logf("Request (%s)\t%s\t%s (%s): Code %d", resp.Endpoint(), strings.ToUpper(req.Method()), req.Path(), time.Now().Sub(t).String(), resp.StatusCode())
+		return resp, err
+	}
+}
+
+func (l logWrapper) Unmarshal(data driver.RawObject, result interface{}) error {
+	return l.c.Unmarshal(data, result)
+}
+
+func (l logWrapper) Endpoints() []string {
+	return l.c.Endpoints()
+}
+
+func (l logWrapper) UpdateEndpoints(endpoints []string) error {
+	return l.c.UpdateEndpoints(endpoints)
+}
+
+func (l logWrapper) SetAuthentication(authentication driver.Authentication) (driver.Connection, error) {
+	if c, err := l.c.SetAuthentication(authentication); err != nil {
+		return nil, err
+	} else {
+		return WrapLogger(l.t, c), nil
+	}
+}
+
+func (l logWrapper) Protocols() driver.ProtocolSet {
+	return l.c.Protocols()
+}