Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 14:17:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix lint warnings and update CI tests to Go 1.7.1

Browse source
This commit is contained in:
Matthew Holt 2016-09-19 17:25:21 -06:00
parent 8ecd543519
commit c4a177bd3b
No known key found for this signature in database
GPG key ID: 0D97CC73664F4D03
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -2,7 +2,7 @@ language: go
go:
- 1.6.3
- 1.7
- 1.7.1
- tip
matrix:

20
caddyfile/parse_test.go
View file

@ -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)
}