Moved fake server logic to the test

acroca · Jul 22, 2022 · f389c1e · f389c1e
1 parent 03acff2
commit f389c1e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/test/integration_test.go b/test/integration_test.go
@@ -1,8 +1,11 @@
 package test
 
 import (
+	"fmt"
 	"io/ioutil"
+	"math/rand"
 	"net/http"
+	"strconv"
 	"testing"
 	"time"
 
@@ -13,6 +16,22 @@ func TestHappyPath(t *testing.T) {
 	suite := newSuite(t)
 	defer suite.teardown()
 
+	suite.runFakeServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		number := 0
+
+		currentCookie, err := r.Cookie("test-cookie")
+		if err == http.ErrNoCookie {
+			number = rand.Intn(10000000)
+		} else {
+			number, err = strconv.Atoi(currentCookie.Value)
+			require.NoError(t, err)
+		}
+		w.Header().Add("Set-Cookie", fmt.Sprintf("test-cookie=%v,", number))
+
+		w.WriteHeader(200)
+		w.Write([]byte(strconv.Itoa(number)))
+	}))
+
 	repo := suite.repo()
 
 	require.NoError(t, repo.CreateBucket("testBucket"))

diff --git a/test/suite_test.go b/test/suite_test.go
@@ -2,13 +2,11 @@ package test
 
 import (
 	"fmt"
-	"math/rand"
 	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"os/exec"
-	"strconv"
 	"strings"
 	"testing"
 
@@ -37,7 +35,6 @@ func newSuite(t *testing.T) *Suite {
 	suite.network()
 	suite.runVault()
 	suite.runMitm()
-	suite.runFakeServer()
 	return suite
 }
 
@@ -103,7 +100,7 @@ func (s *Suite) runMitm() {
 	}
 }
 
-func (s *Suite) runFakeServer() {
+func (s *Suite) runFakeServer(fn http.HandlerFunc) {
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(s.t, err)
 	port := listener.Addr().(*net.TCPAddr).Port
@@ -114,21 +111,7 @@ func (s *Suite) runFakeServer() {
 		s.fakeServerAddr = fmt.Sprintf("http://fake-server:%v", port)
 	}
 
-	go http.Serve(listener, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		number := 0
-
-		currentCookie, err := r.Cookie("test-cookie")
-		if err == http.ErrNoCookie {
-			number = rand.Intn(10000000)
-		} else {
-			number, err = strconv.Atoi(currentCookie.Value)
-			require.NoError(s.t, err)
-		}
-		w.Header().Add("Set-Cookie", fmt.Sprintf("test-cookie=%v,", number))
-
-		w.WriteHeader(200)
-		w.Write([]byte(strconv.Itoa(number)))
-	}))
+	go http.Serve(listener, fn)
 }
 
 func (s *Suite) cmd(t *testing.T, c string) string {