From de1f94cbc703941a72d8a8242946a06fbf845824 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Tue, 30 Sep 2014 14:31:17 -0400 Subject: [PATCH] Fix integration test --- cmd/integration/integration.go | 4 ++-- test/integration/client_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index d66727156ecee..fffd209d04da8 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -106,7 +106,7 @@ func startComponents(manifestURL string) (apiServerURL string) { } } - cl := client.NewOrDie(apiServer.URL, "", nil) + cl := client.NewOrDie(api.NewContext(), apiServer.URL, "", nil) cl.PollPeriod = time.Second * 1 cl.Sync = true @@ -311,7 +311,7 @@ func main() { // Wait for the synchronization threads to come up. time.Sleep(time.Second * 10) - kubeClient := client.NewOrDie(apiServerURL, "", nil) + kubeClient := client.NewOrDie(api.NewContext(), apiServerURL, "", nil) // Run tests in parallel testFuncs := []testFunc{ diff --git a/test/integration/client_test.go b/test/integration/client_test.go index b5cd44fec67f9..07640d4afb89f 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -61,7 +61,7 @@ func TestClient(t *testing.T) { for apiVersion, values := range testCases { deleteAllEtcdKeys() s := httptest.NewServer(apiserver.Handle(values.Storage, values.Codec, fmt.Sprintf("/api/%s/", apiVersion), values.selfLinker)) - client := client.NewOrDie(s.URL, apiVersion, nil) + client := client.NewOrDie(api.NewContext(), s.URL, apiVersion, nil) info, err := client.ServerVersion() if err != nil {