From 061792d2dc0ac13d8f48487a930cdaded63a29e2 Mon Sep 17 00:00:00 2001
From: Jeevanandam M <jeeva@myjeeva.com>
Date: Mon, 30 May 2016 22:25:36 -0700
Subject: [PATCH] travis config update

---
 .travis.yml   | 16 +++++++++++-----
 resty_test.go |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7be0ec03..12c9ba2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,6 @@
 language: go
 
-install:
-  - go get .
-
-script:
-  - go test -v .
+sudo: false
 
 go:
   - 1.2
@@ -13,3 +9,13 @@ go:
   - 1.5
   - 1.6
   - tip
+
+install:
+  - go get .
+
+script:
+  - go test -v .
+
+matrix:
+  allow_failures:
+    - go: tip
diff --git a/resty_test.go b/resty_test.go
index cb250f7e..833705ee 100644
--- a/resty_test.go
+++ b/resty_test.go
@@ -1359,7 +1359,7 @@ func createGetServer(t *testing.T) *httptest.Server {
 			} else if r.URL.Path == "/mypage2" {
 				w.Write([]byte("TestGet: text response from mypage2"))
 			} else if r.URL.Path == "/set-timeout-test" {
-				time.Sleep(time.Second * 5)
+				time.Sleep(time.Second * 6)
 				w.Write([]byte("TestClientTimeout page"))
 			} else if r.URL.Path == "/my-image.png" {
 				fileBytes, _ := ioutil.ReadFile(getTestDataPath() + "/test-img.png")