From 2f5eeee1f63fb667319f4198425a373afbcc13fb Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Thu, 3 Jul 2014 21:23:21 -0700
Subject: [PATCH] Make sync false by default.  Works around timeout/retry
 issues.

---
 pkg/client/request.go      | 2 +-
 pkg/client/request_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/client/request.go b/pkg/client/request.go
index 072285a0fe7..1850bce2266 100644
--- a/pkg/client/request.go
+++ b/pkg/client/request.go
@@ -46,7 +46,7 @@ func (c *Client) Verb(verb string) *Request {
 		verb:       verb,
 		c:          c,
 		path:       "/api/v1beta1",
-		sync:       true,
+		sync:       false,
 		timeout:    20 * time.Second,
 		pollPeriod: 20 * time.Second,
 	}
diff --git a/pkg/client/request_test.go b/pkg/client/request_test.go
index 104e8a70715..14383e0aa47 100644
--- a/pkg/client/request_test.go
+++ b/pkg/client/request_test.go
@@ -59,7 +59,7 @@ func TestDoRequestNewWay(t *testing.T) {
 		t.Errorf("Expected: %#v, got %#v", expectedObj, obj)
 	}
 	fakeHandler.ValidateRequest(t, "/api/v1beta1/foo/bar/baz", "POST", &reqBody)
-	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo&sync=true&timeout=1s" {
+	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo" {
 		t.Errorf("Unexpected query: %v", fakeHandler.RequestReceived.URL.RawQuery)
 	}
 	if fakeHandler.RequestReceived.Header["Authorization"] == nil {
@@ -138,7 +138,7 @@ func TestDoRequestNewWayObj(t *testing.T) {
 	}
 	tmpStr := string(reqBodyExpected)
 	fakeHandler.ValidateRequest(t, "/api/v1beta1/foo/bar/baz", "POST", &tmpStr)
-	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo&sync=true&timeout=1s" {
+	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo" {
 		t.Errorf("Unexpected query: %v", fakeHandler.RequestReceived.URL.RawQuery)
 	}
 	if fakeHandler.RequestReceived.Header["Authorization"] == nil {
@@ -183,7 +183,7 @@ func TestDoRequestNewWayFile(t *testing.T) {
 	}
 	tmpStr := string(reqBodyExpected)
 	fakeHandler.ValidateRequest(t, "/api/v1beta1/foo/bar/baz", "POST", &tmpStr)
-	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo&sync=true&timeout=1s" {
+	if fakeHandler.RequestReceived.URL.RawQuery != "labels=name%3Dfoo" {
 		t.Errorf("Unexpected query: %v", fakeHandler.RequestReceived.URL.RawQuery)
 	}
 	if fakeHandler.RequestReceived.Header["Authorization"] == nil {
@@ -219,7 +219,7 @@ func TestAbsPath(t *testing.T) {
 func TestSync(t *testing.T) {
 	c := New("", nil)
 	r := c.Get()
-	if !r.sync {
+	if r.sync {
 		t.Errorf("sync has wrong default")
 	}
 	r.Sync(false)