Unify 15s timeout in the end of tests

Small reduction. Seems enough for CI as well.
canonical · Oct 11, 2023 · a84f602 · a84f602
1 parent 9090edd
commit a84f602
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/end-to-end/manual_token_input_test.go b/end-to-end/manual_token_input_test.go
@@ -67,10 +67,11 @@ func TestManualTokenInput(t *testing.T) {
 				require.NoErrorf(t, err, "Setup: could not wake distro up: %v. %s", err, out)
 			}
 
-			maxTimeout := 15 * time.Second
+			const maxTimeout = 15 * time.Second
+
 			if !tc.wantAttached {
 				time.Sleep(maxTimeout)
-				proCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+				proCtx, cancel := context.WithTimeout(ctx, maxTimeout)
 				defer cancel()
 				attached, err := distroIsProAttached(t, proCtx, d)
 				require.NoError(t, err, "could not determine if distro is attached")

diff --git a/end-to-end/organization_token_test.go b/end-to-end/organization_token_test.go
@@ -67,11 +67,11 @@ func TestOrganizationProvidedToken(t *testing.T) {
 				require.NoErrorf(t, err, "Setup: could not wake distro up: %v. %s", err, out)
 			}
 
-			const maxTimeout = 30 * time.Second
+			const maxTimeout = 15 * time.Second
 
 			if !tc.wantAttached {
 				time.Sleep(maxTimeout)
-				proCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+				proCtx, cancel := context.WithTimeout(ctx, maxTimeout)
 				defer cancel()
 				attached, err := distroIsProAttached(t, proCtx, d)
 				require.NoError(t, err, "could not determine if distro is attached")