set waittime on tests

getlantern · Oct 25, 2024 · eda8ab2 · eda8ab2
1 parent 86e11cc
commit eda8ab2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/context.go b/context.go
@@ -73,13 +73,12 @@ func (fctx *FrontingContext) ConfigureWithHello(pool *x509.CertPool, providers m
 		existing.closeCache()
 	}
 
-	f, err := newFronted(pool, providers, defaultProviderID, cacheFile, clientHelloID, func(f *fronted) {
-
+	_, err := newFronted(pool, providers, defaultProviderID, cacheFile, clientHelloID, func(f *fronted) {
+		fctx.instance.Set(f)
 	})
 	if err != nil {
 		return err
 	}
-	fctx.instance.Set(f)
 	return nil
 }
 

diff --git a/fronted_test.go b/fronted_test.go
@@ -57,7 +57,7 @@ func TestDirectDomainFrontingWithSNIConfig(t *testing.T) {
 	})
 	Configure(certs, p, testProviderID, cacheFile)
 
-	transport, ok := NewFronted(0)
+	transport, ok := NewFronted(30 * time.Second)
 	require.True(t, ok)
 	client := &http.Client{
 		Transport: transport,
@@ -94,7 +94,7 @@ func doTestDomainFronting(t *testing.T, cacheFile string, expectedMasqueradesAtE
 	}
 	require.True(t, doCheck(client, http.MethodPost, http.StatusAccepted, pingURL))
 
-	transport, ok = NewFronted(0)
+	transport, ok = NewFronted(30 * time.Second)
 	require.True(t, ok)
 	client = &http.Client{
 		Transport: transport,
@@ -238,7 +238,7 @@ func TestHostAliasesBasic(t *testing.T) {
 	certs.AddCert(cloudSack.Certificate())
 	Configure(certs, map[string]*Provider{"cloudsack": p}, "cloudsack", "")
 
-	rt, ok := NewFronted(10 * time.Second)
+	rt, ok := NewFronted(30 * time.Second)
 	if !assert.True(t, ok, "failed to obtain direct roundtripper") {
 		return
 	}
@@ -349,7 +349,7 @@ func TestHostAliasesMulti(t *testing.T) {
 	}
 
 	Configure(certs, providers, "cloudsack", "")
-	rt, ok := NewFronted(10 * time.Second)
+	rt, ok := NewFronted(30 * time.Second)
 	if !assert.True(t, ok, "failed to obtain direct roundtripper") {
 		return
 	}
@@ -475,7 +475,7 @@ func TestPassthrough(t *testing.T) {
 	certs.AddCert(cloudSack.Certificate())
 	Configure(certs, map[string]*Provider{"cloudsack": p}, "cloudsack", "")
 
-	rt, ok := NewFronted(10 * time.Second)
+	rt, ok := NewFronted(30 * time.Second)
 	if !assert.True(t, ok, "failed to obtain direct roundtripper") {
 		return
 	}
@@ -615,7 +615,7 @@ func TestCustomValidators(t *testing.T) {
 
 	for _, test := range tests {
 		setup(test.validator)
-		direct, ok := NewFronted(1 * time.Second)
+		direct, ok := NewFronted(30 * time.Second)
 		if !assert.True(t, ok) {
 			return
 		}