summaryrefslogtreecommitdiff
path: root/test/e2e/libpod_suite_remote_test.go
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2021-11-03 16:37:49 +0100
committerMiloslav Trmač <mitr@redhat.com>2022-01-03 12:31:47 +0100
commit90e74e794cc0c2c34112877821ed9ff0e7f51c28 (patch)
tree07458228d1b4df7b792080cafa62767eb0f0c46f /test/e2e/libpod_suite_remote_test.go
parentee146a9ab0721ec6fe2c6e3092928c34a9b3b6d7 (diff)
downloadpodman-90e74e794cc0c2c34112877821ed9ff0e7f51c28.tar.gz
podman-90e74e794cc0c2c34112877821ed9ff0e7f51c28.tar.bz2
podman-90e74e794cc0c2c34112877821ed9ff0e7f51c28.zip
Avoid collisions on RemoteSocket paths
Add lock files and re-generate the UUID if we are not a known-unique user of the socket path. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'test/e2e/libpod_suite_remote_test.go')
-rw-r--r--test/e2e/libpod_suite_remote_test.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index d60383029..4644e3748 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -1,3 +1,4 @@
+//go:build remote
// +build remote
package integration
@@ -143,6 +144,11 @@ func (p *PodmanTestIntegration) StopRemoteService() {
if err := os.Remove(socket); err != nil {
fmt.Println(err)
}
+ if p.RemoteSocketLock != "" {
+ if err := os.Remove(p.RemoteSocketLock); err != nil {
+ fmt.Println(err)
+ }
+ }
}
//MakeOptions assembles all the podman main options