Skip to content

Commit cfe992c

Browse files
Prevent infinite loop in TestAccComputeDisk_imageDiffSuppressPublicVe… (#9273) (#16266)
[upstream:92f92bf55c85dc529bc38d4600e963cef0077cd1] Signed-off-by: Modular Magician <[email protected]>
1 parent 60b16cb commit cfe992c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.changelog/9273.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google/services/compute/resource_compute_disk_test.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,11 @@ func TestAccComputeDisk_imageDiffSuppressPublicVendorsFamilyNames(t *testing.T)
307307

308308
for _, publicImageProject := range tpgcompute.ImageMap {
309309
token := ""
310-
for paginate := true; paginate; {
310+
// Hard limit on number of pages to prevent infinite loops
311+
// caused by the API always returning a pagination token
312+
page := 0
313+
maxPages := 10
314+
for paginate := true; paginate && page < maxPages; {
311315
resp, err := config.NewComputeClient(config.UserAgent).Images.List(publicImageProject).Filter("deprecated.replacement ne .*images.*").PageToken(token).Do()
312316
if err != nil {
313317
t.Fatalf("Can't list public images for project %q", publicImageProject)
@@ -320,6 +324,7 @@ func TestAccComputeDisk_imageDiffSuppressPublicVendorsFamilyNames(t *testing.T)
320324
}
321325
token := resp.NextPageToken
322326
paginate = token != ""
327+
page++
323328
}
324329
}
325330
}

0 commit comments

Comments
 (0)