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

Merge pull request #6384 from dcantah/fix-nodaemon

Browse Source 
Fix no-daemon flag for integration/client tests
This commit is contained in:
Michael Crosby 2021-12-20 13:26:57 -05:00 committed by GitHub
commit 3ae95e78a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration/client/client_test.go
View File

@ -111,6 +111,10 @@ func TestMain(m *testing.M) {
fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String()) fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())
os.Exit(1) os.Exit(1)
} }
} else {
// Otherwise if no-daemon was specified we need to connect to an already running ctrd instance.
// Set the addr field on the daemon object so it knows what to try connecting to.
ctrd.addr = address
} }
waitCtx, waitCancel := context.WithTimeout(ctx, 4*time.Second) waitCtx, waitCancel := context.WithTimeout(ctx, 4*time.Second)