From 0dfe20ef49af6aba797d210ec7a96ab266afb0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20H=C3=B6rl?= Date: Thu, 23 Nov 2017 15:18:54 +0000 Subject: [PATCH] Use http:// as etcd URL scheme Using tcp:// does not work. --- pkg/framework/test/fixtures.go | 4 ++-- pkg/framework/test/fixtures_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/framework/test/fixtures.go b/pkg/framework/test/fixtures.go index 149771f5d..129746f34 100644 --- a/pkg/framework/test/fixtures.go +++ b/pkg/framework/test/fixtures.go @@ -72,10 +72,10 @@ func (t *tempDirManager) Destroy() error { // Start will start all your fixtures. To stop them, call Stop(). func (f *Fixtures) Start() error { tmpDir := f.TempDirManager.Create() - if err := f.Etcd.Start("tcp://127.0.0.1:2379", tmpDir); err != nil { + if err := f.Etcd.Start("http://127.0.0.1:2379", tmpDir); err != nil { return fmt.Errorf("Error starting etcd: %s", err) } - if err := f.APIServer.Start("tcp://127.0.0.1:2379"); err != nil { + if err := f.APIServer.Start("http://127.0.0.1:2379"); err != nil { return fmt.Errorf("Error starting apiserver: %s", err) } return nil diff --git a/pkg/framework/test/fixtures_test.go b/pkg/framework/test/fixtures_test.go index ad19f04d0..d34864362 100644 --- a/pkg/framework/test/fixtures_test.go +++ b/pkg/framework/test/fixtures_test.go @@ -49,14 +49,14 @@ var _ = Describe("Fixtures", func() { Expect(fakeEtcdStartStopper.StartCallCount()).To(Equal(1), "the EtcdStartStopper should be called exactly once") url, datadir := fakeEtcdStartStopper.StartArgsForCall(0) - Expect(url).To(Equal("tcp://127.0.0.1:2379")) + Expect(url).To(Equal("http://127.0.0.1:2379")) Expect(datadir).To(Equal("some temp dir")) By("starting APIServer") Expect(fakeAPIServerStartStopper.StartCallCount()).To(Equal(1), "the APIServerStartStopper should be called exactly once") url = fakeAPIServerStartStopper.StartArgsForCall(0) - Expect(url).To(Equal("tcp://127.0.0.1:2379")) + Expect(url).To(Equal("http://127.0.0.1:2379")) }) Context("when starting etcd fails", func() {