work around moby/moby#42379 triggering race errors in Docker client under test

thediveo · thediveo · commit 8ff72e97ae50 · 2022-06-22T10:31:26.000+02:00
diff --git a/engineclient/moby/moby.go b/engineclient/moby/moby.go
@@ -43,6 +43,7 @@ const PrivilegedLabel = "github.com/thediveo/whalewatcher/moby/privileged"
 type MobyAPIClient interface {
 	client.ContainerAPIClient
 	client.SystemAPIClient
+	NegotiateAPIVersion(ctx context.Context)
 	DaemonHost() string
 	Close() error
 }
@@ -131,6 +132,9 @@ func (mw *MobyWatcher) Close() {
 // List all the currently alive and kicking containers, but do not list any
 // containers without any processes.
 func (mw *MobyWatcher) List(ctx context.Context) ([]*whalewatcher.Container, error) {
+	// https://github.com/moby/moby/pull/42379
+	mw.moby.NegotiateAPIVersion(ctx)
+
 	// Scan the currently available containers and take only the alive into
 	// further consideration. This is a potentially lengthy operation, as we
 	// need to inspect each potential candidate individually due to the way the
@@ -188,6 +192,9 @@ func (mw *MobyWatcher) Inspect(ctx context.Context, nameorid string) (*whalewatc
 // in the lifecycle of containers getting born (=alive, as opposed to, say,
 // "conceived") and die.
 func (mw *MobyWatcher) LifecycleEvents(ctx context.Context) (<-chan engineclient.ContainerEvent, <-chan error) {
+	// https://github.com/moby/moby/pull/42379
+	mw.moby.NegotiateAPIVersion(ctx)
+
 	cntreventstream := make(chan engineclient.ContainerEvent)
 	cntrerrstream := make(chan error, 1)
 
diff --git a/test/mockingmoby/moby.go b/test/mockingmoby/moby.go
@@ -54,6 +54,9 @@ func NewMockingMoby() *MockingMoby {
 	}
 }
 
+// NegotiateAPIVersion is a mock no-op.
+func (mm *MockingMoby) NegotiateAPIVersion(ctx context.Context) {}
+
 // DaemonHost returns the host address used by the client
 func (mm *MockingMoby) DaemonHost() string { return "mock://mocked" }
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ func NewMockingMoby() *MockingMoby {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
	`57`	`+// NegotiateAPIVersion is a mock no-op.`
	`58`	`+func (mm *MockingMoby) NegotiateAPIVersion(ctx context.Context) {}`
	`59`	`+`
`57`	`60`	`// DaemonHost returns the host address used by the client`
`58`	`61`	`func (mm *MockingMoby) DaemonHost() string { return "mock://mocked" }`
`59`	`62`