summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorZeling Feng <zeling@google.com>2021-03-22 14:07:55 -0700
committergVisor bot <gvisor-bot@google.com>2021-03-22 14:10:00 -0700
commit9e86dfc9c5b56eaa91485826bcf3f1f7617d2eb0 (patch)
tree39e967ac2a6d43d79a9eabae0026d92c72c5f821 /pkg
parenta073d76979d1950a52462823c10b495f4f8c3728 (diff)
Fix logs for packetimpact tests cleanup
- Don't cleanup containers in Network.Cleanup, otherwise containers will be killed and removed several times. - Don't set AutoRemove for containers. This will prevent the confusing 'removal already in progress' messages. Fixes #3795 PiperOrigin-RevId: 364404414
Diffstat (limited to 'pkg')
-rw-r--r--pkg/test/dockerutil/network.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/test/dockerutil/network.go b/pkg/test/dockerutil/network.go
index 047091e75..dbe17fa5e 100644
--- a/pkg/test/dockerutil/network.go
+++ b/pkg/test/dockerutil/network.go
@@ -102,11 +102,8 @@ func (n *Network) Inspect(ctx context.Context) (types.NetworkResource, error) {
return n.client.NetworkInspect(ctx, n.id, types.NetworkInspectOptions{Verbose: true})
}
-// Cleanup cleans up the docker network and all the containers attached to it.
+// Cleanup cleans up the docker network.
func (n *Network) Cleanup(ctx context.Context) error {
- for _, c := range n.containers {
- c.CleanUp(ctx)
- }
n.containers = nil
return n.client.NetworkRemove(ctx, n.id)