diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-02-19 17:38:43 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-02-20 14:18:45 -0700 |
| commit | 0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb (patch) | |
| tree | fc0679e6470c4a2a4407002ee9c90766a3a9983e /pkg/bindings/test | |
| parent | 83a9b318e150e96ba381f2fdf0db9d979e0740f0 (diff) | |
| download | podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.tar.gz podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.tar.bz2 podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.zip | |
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 <jhonce@redhat.com>
Diffstat (limited to 'pkg/bindings/test')
| -rw-r--r-- | pkg/bindings/test/common_test.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/test/images_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
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()) }) |