From 807585b7294b4232297519b0d413fe24d29776f3 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Thu, 5 Dec 2024 18:18:38 -0800
Subject: [PATCH] integration: add extra timeout for GHA test

This test can hit rate-limiting from Github and run long.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 client/client_test.go                | 4 ++--
 util/testutil/integration/sandbox.go | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
index e7a5886f8eec..58cd6d947550 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -149,7 +149,7 @@ var allTests = []func(t *testing.T, sb integration.Sandbox){
 	testHostnameSpecifying,
 	testPushByDigest,
 	testBasicInlineCacheImportExport,
-	testBasicGhaCacheImportExport,
+	testBasicGhaCacheImportExportExtraTimeout,
 	testExportBusyboxLocal,
 	testBridgeNetworking,
 	testCacheMountNoCache,
@@ -6060,7 +6060,7 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {
 	require.EqualValues(t, unique, unique3)
 }
 
-func testBasicGhaCacheImportExport(t *testing.T, sb integration.Sandbox) {
+func testBasicGhaCacheImportExportExtraTimeout(t *testing.T, sb integration.Sandbox) {
 	workers.CheckFeatureCompat(t, sb,
 		workers.FeatureCacheExport,
 		workers.FeatureCacheImport,
diff --git a/util/testutil/integration/sandbox.go b/util/testutil/integration/sandbox.go
index 1f112275b5d7..f28fbf1765dc 100644
--- a/util/testutil/integration/sandbox.go
+++ b/util/testutil/integration/sandbox.go
@@ -119,7 +119,11 @@ func newSandbox(ctx context.Context, t *testing.T, w Worker, mirror string, mv m
 	ctx, cancel := context.WithCancelCause(ctx)
 
 	go func() {
-		timeoutContext, cancelTimeout := context.WithTimeoutCause(ctx, maxSandboxTimeout, errors.WithStack(context.DeadlineExceeded))
+		timeout := maxSandboxTimeout
+		if strings.Contains(t.Name(), "ExtraTimeout") {
+			timeout *= 3
+		}
+		timeoutContext, cancelTimeout := context.WithTimeoutCause(ctx, timeout, errors.WithStack(context.DeadlineExceeded))
 		defer cancelTimeout()
 		<-timeoutContext.Done()
 		select {