From 9e86dfc9c5b56eaa91485826bcf3f1f7617d2eb0 Mon Sep 17 00:00:00 2001 From: Zeling Feng Date: Mon, 22 Mar 2021 14:07:55 -0700 Subject: 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 --- pkg/test/dockerutil/network.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkg') 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) -- cgit v1.2.3