add 1.7 and 1.8 to testing (revel#1143)

shawncatz · notzippy · commit e98ec613e341 · 2017-03-18T06:16:25.000-07:00
* add 1.7 and 1.8 to tests

* remove 1.4, just bumping
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: go
 
 go:
-  - 1.4
   - 1.5
   - 1.6
+  - 1.7
+  - 1.8
   - tip
 
 os:
@@ -24,9 +25,14 @@ services:
 
 before_install:
   # TRAVIS_OS_NAME - linux and osx
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install memcached redis; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup /usr/local/opt/memcached/bin/memcached & fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup redis-server /usr/local/etc/redis.conf & fi'
+  - echo $TRAVIS_OS_NAME
+  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install memcached redis && brew services start redis && brew services start memcached; fi'
+#  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start redis-server && brew services start memcached; fi'
+  #- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup /usr/local/opt/memcached/bin/memcached & fi'
+  #- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup redis-server /usr/local/etc/redis.conf & fi'
+#  - 'if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo start redis-server & fi'
+  - redis-server --daemonize yes
+  - redis-cli info
 
 install:
   # Setting environments variables
diff --git a/testing/testsuite_test.go b/testing/testsuite_test.go
@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {
 
 	testSuite.AssertOk()
 	testSuite.AssertContentType("application/json")
-	testSuite.AssertHeader("Server", "nginx")
+	testSuite.AssertHeader("Server", "gunicorn/19.7.0")
 	testSuite.AssertContains("httpbin.org")
 	testSuite.AssertContainsRegex("gzip|deflate")
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {`
`76`	`76`
`77`	`77`	`testSuite.AssertOk()`
`78`	`78`	`testSuite.AssertContentType("application/json")`
`79`		`- testSuite.AssertHeader("Server", "nginx")`
	`79`	`+ testSuite.AssertHeader("Server", "gunicorn/19.7.0")`
`80`	`80`	`testSuite.AssertContains("httpbin.org")`
`81`	`81`	`testSuite.AssertContainsRegex("gzip\|deflate")`
`82`	`82`	`}`