From c4a177bd3beb5bd782a1b494ab12bcf8964a1bb8 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Mon, 19 Sep 2016 17:25:21 -0600
Subject: [PATCH] Fix lint warnings and update CI tests to Go 1.7.1

---
 .travis.yml             |  2 +-
 caddyfile/parse_test.go | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 517c1bcf8..90533daaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: go
 
 go:
   - 1.6.3
-  - 1.7
+  - 1.7.1
   - tip
 
 matrix:
diff --git a/caddyfile/parse_test.go b/caddyfile/parse_test.go
index 58d4e8e60..f7d021a33 100644
--- a/caddyfile/parse_test.go
+++ b/caddyfile/parse_test.go
@@ -275,33 +275,33 @@ func TestRecursiveImport(t *testing.T) {
 		return true
 	}
 
-	recursive_file1, err := filepath.Abs("testdata/recursive_import_test1")
+	recursiveFile1, err := filepath.Abs("testdata/recursive_import_test1")
 	if err != nil {
 		t.Fatal(err)
 	}
-	recursive_file2, err := filepath.Abs("testdata/recursive_import_test2")
+	recursiveFile2, err := filepath.Abs("testdata/recursive_import_test2")
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// test relative recursive import
-	err = ioutil.WriteFile(recursive_file1, []byte(
+	err = ioutil.WriteFile(recursiveFile1, []byte(
 		`localhost
 		dir1
 		import recursive_import_test2`), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(recursive_file1)
+	defer os.Remove(recursiveFile1)
 
-	err = ioutil.WriteFile(recursive_file2, []byte("dir2 1"), 0644)
+	err = ioutil.WriteFile(recursiveFile2, []byte("dir2 1"), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Remove(recursive_file2)
+	defer os.Remove(recursiveFile2)
 
 	// import absolute path
-	result, err := testParseOne("import " + recursive_file1)
+	result, err := testParseOne("import " + recursiveFile1)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -319,16 +319,16 @@ func TestRecursiveImport(t *testing.T) {
 	}
 
 	// test absolute recursive import
-	err = ioutil.WriteFile(recursive_file1, []byte(
+	err = ioutil.WriteFile(recursiveFile1, []byte(
 		`localhost
 		dir1
-		import `+recursive_file2), 0644)
+		import `+recursiveFile2), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// import absolute path
-	result, err = testParseOne("import " + recursive_file1)
+	result, err = testParseOne("import " + recursiveFile1)
 	if err != nil {
 		t.Fatal(err)
 	}