Skip to content

Commit 807585b

Browse files
committed
integration: add extra timeout for GHA test
This test can hit rate-limiting from Github and run long. Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 58b5e6a commit 807585b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

client/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ var allTests = []func(t *testing.T, sb integration.Sandbox){
149149
testHostnameSpecifying,
150150
testPushByDigest,
151151
testBasicInlineCacheImportExport,
152-
testBasicGhaCacheImportExport,
152+
testBasicGhaCacheImportExportExtraTimeout,
153153
testExportBusyboxLocal,
154154
testBridgeNetworking,
155155
testCacheMountNoCache,
@@ -6060,7 +6060,7 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {
60606060
require.EqualValues(t, unique, unique3)
60616061
}
60626062

6063-
func testBasicGhaCacheImportExport(t *testing.T, sb integration.Sandbox) {
6063+
func testBasicGhaCacheImportExportExtraTimeout(t *testing.T, sb integration.Sandbox) {
60646064
workers.CheckFeatureCompat(t, sb,
60656065
workers.FeatureCacheExport,
60666066
workers.FeatureCacheImport,

util/testutil/integration/sandbox.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,11 @@ func newSandbox(ctx context.Context, t *testing.T, w Worker, mirror string, mv m
119119
ctx, cancel := context.WithCancelCause(ctx)
120120

121121
go func() {
122-
timeoutContext, cancelTimeout := context.WithTimeoutCause(ctx, maxSandboxTimeout, errors.WithStack(context.DeadlineExceeded))
122+
timeout := maxSandboxTimeout
123+
if strings.Contains(t.Name(), "ExtraTimeout") {
124+
timeout *= 3
125+
}
126+
timeoutContext, cancelTimeout := context.WithTimeoutCause(ctx, timeout, errors.WithStack(context.DeadlineExceeded))
123127
defer cancelTimeout()
124128
<-timeoutContext.Done()
125129
select {

0 commit comments

Comments
 (0)