Fallback to dktest.DefaultCleanupTimeout if the dktest.Options doesn'…

…t have one specified
golang-migrate · Apr 16, 2024 · f4950c1 · f4950c1
1 parent b1d02e2
commit f4950c1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dktesting/dktesting.go b/dktesting/dktesting.go
@@ -30,7 +30,11 @@ func (s *ContainerSpec) Cleanup() (retErr error) {
 			retErr = fmt.Errorf("error closing Docker client: %w", err)
 		}
 	}()
-	ctx, timeoutCancelFunc := context.WithTimeout(context.Background(), s.Options.CleanupTimeout)
+	cleanupTimeout := s.Options.CleanupTimeout
+	if cleanupTimeout <= 0 {
+		cleanupTimeout = dktest.DefaultCleanupTimeout
+	}
+	ctx, timeoutCancelFunc := context.WithTimeout(context.Background(), cleanupTimeout)
 	defer timeoutCancelFunc()
 	if _, err := dc.ImageRemove(ctx, s.ImageName, types.ImageRemoveOptions{Force: true, PruneChildren: true}); err != nil {
 		return err