Fix shutdownDelay for integration tests #59

coupergateway · Nov 9, 2020 · 0935f1e · 0935f1e
1 parent 18a3a3c
commit 0935f1e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 8 deletions.
diff --git a/internal/test/context.go b/internal/test/context.go
@@ -0,0 +1,9 @@
+package test
+
+import "context"
+
+const Key = "test_bug2kguvvhfvuij7gcsg"
+
+func NewContext(background context.Context) context.Context {
+	return context.WithValue(background, Key, true)
+}
diff --git a/server/http.go b/server/http.go
@@ -14,6 +14,7 @@ import (
 	"github.com/avenga/couper/config/request"
 	"github.com/avenga/couper/config/runtime"
 	"github.com/avenga/couper/handler"
+	"github.com/avenga/couper/internal/test"
 	"github.com/avenga/couper/logging"
 )
 
@@ -143,6 +144,13 @@ func (s *HTTPServer) listenForCtx() {
 		}
 		s.log.WithFields(logFields).Warn("shutting down")
 		close(s.shutdownCh)
+
+		// testHook - skip shutdownDelay
+		if _, ok := s.commandCtx.Value(test.Key).(bool); ok {
+			_ = s.srv.Shutdown(context.TODO())
+			return
+		}
+
 		time.Sleep(s.config.Timings.ShutdownDelay)
 		ctx, cancel := context.WithTimeout(context.Background(), s.config.Timings.ShutdownTimeout)
 		defer cancel()

diff --git a/server/http_integration_test.go b/server/http_integration_test.go
@@ -3,6 +3,7 @@ package server_test
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -13,6 +14,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	logrustest "github.com/sirupsen/logrus/hooks/test"
 
 	"github.com/avenga/couper/command"
@@ -85,11 +87,17 @@ func newCouper(file string, helper *test.Helper) (func(), *logrustest.Hook) {
 
 	log, hook := logrustest.NewNullLogger()
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(test.NewContext(context.Background()))
 	go func() {
-		helper.Must(command.NewRun(ctx).Execute([]string{file}, gatewayConf, log.WithContext(context.Background())))
+		helper.Must(command.NewRun(ctx).Execute([]string{file}, gatewayConf, log.WithContext(ctx)))
 	}()
 	time.Sleep(time.Second / 2)
+
+	entry := hook.LastEntry()
+	if entry.Level < logrus.InfoLevel {
+		helper.Must(fmt.Errorf(entry.String()))
+	}
+
 	hook.Reset() // no startup logs
 	return cancel, hook
 }
@@ -116,19 +124,20 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 		requests []requestCase
 	}
 
+	dialer := &net.Dialer{}
 	client := &http.Client{
 		Transport: &http.Transport{
 			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				_, port, _ := net.SplitHostPort(addr)
 				if port != "" {
-					return net.Dial("tcp4", "127.0.0.1:"+port)
+					return dialer.DialContext(ctx, "tcp4", "127.0.0.1:"+port)
 				}
-				return net.Dial("tcp4", "127.0.0.1")
+				return dialer.DialContext(ctx, "tcp4", "127.0.0.1")
 			},
 		},
 	}
 
-	for _, testcase := range []testCase{
+	for i, testcase := range []testCase{
 		{"spa/01_couper.hcl", []requestCase{
 			{
 				testRequest{http.MethodGet, "http://anyserver:8080/"},
@@ -145,8 +154,20 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 				expectation{http.StatusOK, []byte(`<html><body><title>1.0</title></body></html>`), nil, "file"},
 			},
 		}},
+		{"api/01_couper.hcl", []requestCase{
+			{
+				testRequest{http.MethodGet, "http://anyserver:8080/"},
+				expectation{http.StatusOK, []byte(`<html>1002</html>`), nil, ""},
+			},
+			{
+				testRequest{http.MethodGet, "http://anyserver:8080/v1/anything"},
+				expectation{http.StatusOK, []byte(`<html><body><title>1.0</title></body></html>`), http.Header{"Content-Type": {"application/json"}}, "api"},
+			},
+		}},
 	} {
-		cancelFn, logHook := newCouper(path.Join("testdata/integration", testcase.fileName), test.New(t))
+		confPath := path.Join("testdata/integration", testcase.fileName)
+		t.Logf("#%.2d: Create Couper: %q", i+1, confPath)
+		shutdown, logHook := newCouper(confPath, test.New(t))
 
 		for _, rc := range testcase.requests {
 			t.Run(testcase.fileName+" "+rc.req.method+"|"+rc.req.url, func(subT *testing.T) {
@@ -179,6 +200,7 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 				}
 
 				entry := logHook.LastEntry()
+
 				if entry == nil || entry.Data["type"] != "couper_access" {
 					t.Error("Expected a log entry, got nothing")
 					return
@@ -188,7 +210,6 @@ func TestHTTPServer_ServeHTTP(t *testing.T) {
 				}
 			})
 		}
-
-		cancelFn()
+		shutdown()
 	}
 }
diff --git a/server/testdata/integration/api/01_couper.hcl b/server/testdata/integration/api/01_couper.hcl
@@ -0,0 +1,12 @@
+server "api" {
+  api {
+    base_path = "/v1"
+
+    endpoint "/" {
+      backend {
+        path = "/anything"
+        origin = "http://anyserver/"
+      }
+    }
+  }
+}