Fix race over 'defaultTestConfig'

gateway/gateway_test.go

@@ -840,16 +840,13 @@ func TestMultiTargetProxy(t *testing.T) {
 }
 
 func TestCustomDomain(t *testing.T) {
-	ts := StartTest(nil)
-	t.Cleanup(ts.Close)
-
 	localClient := test.NewClientLocal()
 
 	t.Run("With custom domain support", func(t *testing.T) {
-		globalConf := ts.Gw.GetConfig()
-		globalConf.EnableCustomDomains = true
-		ts.Gw.SetConfig(globalConf)
-		defer ts.ResetTestConfig()
+		ts := StartTest(func(conf *config.Config) {
+			globalConf.EnableCustomDomains = true
+		})
+		t.Cleanup(ts.Close)
 
 		ts.Gw.BuildAndLoadAPI(
 			func(spec *APISpec) {
@@ -871,6 +868,8 @@ func TestCustomDomain(t *testing.T) {
 	})
 
 	t.Run("Without custom domain support", func(t *testing.T) {
+		ts := StartTest(nil)
+		t.Cleanup(ts.Close)
 
 		ts.Gw.BuildAndLoadAPI(
 			func(spec *APISpec) {

gateway/testutil.go

@@ -63,7 +63,6 @@ var (
 	// Used to store the test bundles:
 	testMiddlewarePath, _ = ioutil.TempDir("", "tyk-middleware-path")
 
-	defaultTestConfig config.Config
 	EnableTestDNSMock = false
 	MockHandle        *test.DnsMockHandle
 )
@@ -261,11 +260,6 @@ func InitTestMain(ctx context.Context, m *testing.M) int {
 // TestBrokenClients
 // TestGRPC_TokenBasedAuthentication
 
-// ResetTestConfig resets the config for the global gateway
-func (s *Test) ResetTestConfig() {
-	s.Gw.SetConfig(defaultTestConfig)
-}
-
 // simulate reloads in the background, i.e. writes to
 // global variables that should not be accessed in a
 // racy way like the policies and api specs maps.
@@ -1183,7 +1177,6 @@ func (s *Test) newGateway(genConf func(globalConf *config.Config)) *Gateway {
 	gw.CoProcessInit()
 	gw.afterConfSetup()
 
-	defaultTestConfig = gwConfig
 	gw.SetConfig(gwConfig)
 
 	cli.Init(confPaths)
@@ -1895,7 +1888,6 @@ func (p *httpProxyHandler) handleHTTP(w http.ResponseWriter, req *http.Request)
 }
 
 func (p *httpProxyHandler) Stop(s *Test) error {
-	s.ResetTestConfig()
 	return p.server.Close()
 }