From 6afaefa5bfb6f14520c5f05a49f27f89fb20539e Mon Sep 17 00:00:00 2001
From: Ryan O'Hara-Reid <oharareid.ryan@gmail.com>
Date: Fri, 28 Jul 2017 16:39:36 +1000
Subject: [PATCH] Updated Travis.yml and test procedures in common

---
 .travis.yml           | 10 +++++-----
 common/common_test.go |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e0f8f67..52f76868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,14 @@
 language: go
 
-go:	
- - 1.7
- - tip
+go:
+ - 1.8.x
+ - master
 
 before_install:
  - go get -t -v ./...
 
 script:
- - go test -race -coverprofile=coverage.txt -covermode=atomic
+ - ./test.sh
 
 install:
  - go get github.com/gorilla/websocket
@@ -18,4 +18,4 @@ install:
  - go get github.com/gorilla/mux
 
 after_success:
- - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
+ - bash <(curl -s https://codecov.io/bash)
diff --git a/common/common_test.go b/common/common_test.go
index f762bd98..a18a696c 100644
--- a/common/common_test.go
+++ b/common/common_test.go
@@ -558,7 +558,6 @@ func TestExtractPort(t *testing.T) {
 }
 
 func TestOutputCSV(t *testing.T) {
-	t.Parallel()
 	path := "../testdata/dump"
 	data := [][]string{}
 	rowOne := []string{"Appended", "to", "two", "dimensional", "array"}