dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-04 15:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49559 from thaJeztah/testutil_remove_isErrNotFoundSwarmClassic

Browse Source 
testutil: remove isErrNotFoundSwarmClassic
This commit is contained in:
Akihiro Suda
2025-03-04 17:45:15 +09:00
committed by GitHub
parent 2b9b239db0 aa9817b0c5
commit 41fe41382e
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testutil/environment/clean.go
View File

@@ -81,7 +81,7 @@ func deleteAllContainers(ctx context.Context, t testing.TB, apiclient client.Con
Force: true,
RemoveVolumes: true,
})
if err == nil || errdefs.IsNotFound(err) || alreadyExists.MatchString(err.Error()) || isErrNotFoundSwarmClassic(err) {
if err == nil || errdefs.IsNotFound(err) || alreadyExists.MatchString(err.Error()) {
continue
}
assert.Check(t, err, "failed to remove %s", ctr.ID)
@@ -140,10 +140,6 @@ func deleteAllVolumes(ctx context.Context, t testing.TB, c client.VolumeAPIClien
continue
}
err := c.VolumeRemove(ctx, v.Name, true)
// Docker EE may list volumes that no longer exist.
if isErrNotFoundSwarmClassic(err) {
continue
}
assert.Check(t, err, "failed to remove volume %s", v.Name)
}
}
@@ -186,9 +182,3 @@ func deleteAllPlugins(ctx context.Context, t testing.TB, c client.PluginAPIClien
assert.Check(t, err, "failed to remove plugin %s", p.ID)
}
}
// Swarm classic aggregates node errors and returns a 500 so we need to check
// the error string instead of just IsErrNotFound().
func isErrNotFoundSwarmClassic(err error) bool {
return err != nil && strings.Contains(strings.ToLower(err.Error()), "no such")
}