From 03e99ba9b25d9d0525e4c3520780ed1b98eddd3f Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 31 Mar 2015 15:12:15 -0700 Subject: [PATCH] Fix panic in integration tests Closing activationLock only if it's not closed already. This is needed only because integration tests using docker code directly and doesn't care about global state. Signed-off-by: Alexander Morozov Upstream-commit: c71747571458bf992c729c483c9509e8182d630b Component: engine --- components/engine/api/server/server_linux.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/api/server/server_linux.go b/components/engine/api/server/server_linux.go index 972f5ff74e..0de20a5f11 100644 --- a/components/engine/api/server/server_linux.go +++ b/components/engine/api/server/server_linux.go @@ -95,7 +95,9 @@ func AcceptConnections(job *engine.Job) error { go systemd.SdNotify("READY=1") // close the lock so the listeners start accepting connections - if activationLock != nil { + select { + case <-activationLock: + default: close(activationLock) }