From 807213fd325e334a3acadc733775cc0103d7b29c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 8 Dec 2021 10:41:13 -0800 Subject: [PATCH] Update restart monitor test to output daemon logs on failure Signed-off-by: Derek McGowan --- integration/client/restart_monitor_test.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index fa400cb2c..ef608c454 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -32,6 +32,7 @@ import ( "github.com/containerd/containerd/oci" "github.com/containerd/containerd/pkg/testutil" srvconfig "github.com/containerd/containerd/services/server/config" + "github.com/containerd/containerd/sys" exec "golang.org/x/sys/execabs" ) @@ -97,21 +98,25 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun cleanup := func() { if err := client.Close(); err != nil { - t.Fatalf("failed to close client: %v", err) + t.Errorf("failed to close client: %v", err) } if err := ctrd.Stop(); err != nil { if err := ctrd.Kill(); err != nil { - t.Fatalf("failed to signal containerd: %v", err) + t.Errorf("failed to signal containerd: %v", err) } } if err := ctrd.Wait(); err != nil { if _, ok := err.(*exec.ExitError); !ok { - t.Fatalf("failed to wait for: %v", err) + t.Errorf("failed to wait for: %v", err) } } - if err := os.RemoveAll(tempDir); err != nil { - t.Fatalf("failed to remove %s: %v", tempDir, err) + if err := sys.ForceRemoveAll(tempDir); err != nil { + t.Errorf("failed to remove %s: %v", tempDir, err) } + if t.Failed() { + t.Log("Daemon output:\n", buf.String()) + } + // cleaning config-specific resources is up to the caller } return client, &ctrd, cleanup