github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update restart monitor test to output daemon logs on failure

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2021-12-08 10:41:13 -08:00
parent 753f95e23f
commit 807213fd32
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
integration/client/restart_monitor_test.go
View File

@ -32,6 +32,7 @@ import (
"github.com/containerd/containerd/oci" "github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/testutil" "github.com/containerd/containerd/pkg/testutil"
srvconfig "github.com/containerd/containerd/services/server/config" srvconfig "github.com/containerd/containerd/services/server/config"
"github.com/containerd/containerd/sys"
exec "golang.org/x/sys/execabs" exec "golang.org/x/sys/execabs"
) )
@ -97,21 +98,25 @@ func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, fun
cleanup := func() { cleanup := func() {
if err := client.Close(); err != nil { 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.Stop(); err != nil {
if err := ctrd.Kill(); 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 err := ctrd.Wait(); err != nil {
if _, ok := err.(*exec.ExitError); !ok { 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 { if err := sys.ForceRemoveAll(tempDir); err != nil {
t.Fatalf("failed to remove %s: %v", tempDir, err) 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 // cleaning config-specific resources is up to the caller
} }
return client, &ctrd, cleanup return client, &ctrd, cleanup