From 0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 19 Feb 2020 17:38:43 -0700 Subject: Add support for ssh:// and unix:// podman clients * Make context keys package safe * Add support for PODMAN_HOST and PODMAN_SSHKEY * Add slight increasing delay when client connections fail * Remove usages of path.Join(), added JoinURL(). '/' is not OS dependent. Signed-off-by: Jhon Honce --- pkg/bindings/test/common_test.go | 2 +- pkg/bindings/test/images_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/bindings/test') diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 8d008d53c..98d64bbaa 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -114,7 +114,7 @@ func newBindingTest() *bindingTest { runRoot: filepath.Join(tmpPath, "run"), artifactDirPath: "", imageCacheDir: "", - sock: fmt.Sprintf("unix:%s", filepath.Join(tmpPath, "api.sock")), + sock: fmt.Sprintf("unix://%s", filepath.Join(tmpPath, "api.sock")), tempDirPath: tmpPath, } return &b diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index 483b6b42d..0b51c8c9e 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -38,7 +38,7 @@ var _ = Describe("Podman images", func() { bt.RestoreImagesFromCache() s = bt.startAPIService() time.Sleep(1 * time.Second) - connText, err = bindings.NewConnection(bt.sock) + connText, err = bindings.NewConnection(context.Background(), bt.sock) Expect(err).To(BeNil()) }) -- cgit v1.2.3-54-g00ecf