summaryrefslogtreecommitdiff
path: root/caddyconfig/caddyfile/parse_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'caddyconfig/caddyfile/parse_test.go')
-rwxr-xr-xcaddyconfig/caddyfile/parse_test.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/caddyconfig/caddyfile/parse_test.go b/caddyconfig/caddyfile/parse_test.go
index 640d0cd..62a3998 100755
--- a/caddyconfig/caddyfile/parse_test.go
+++ b/caddyconfig/caddyfile/parse_test.go
@@ -19,12 +19,11 @@ import (
"io/ioutil"
"os"
"path/filepath"
- "strings"
"testing"
)
func TestAllTokens(t *testing.T) {
- input := strings.NewReader("a b c\nd e")
+ input := []byte("a b c\nd e")
expected := []string{"a", "b", "c", "d", "e"}
tokens, err := allTokens("TestAllTokens", input)
@@ -545,7 +544,10 @@ func TestEnvironmentReplacement(t *testing.T) {
expect: "}{$",
},
} {
- actual := replaceEnvVars([]byte(test.input))
+ actual, err := replaceEnvVars([]byte(test.input))
+ if err != nil {
+ t.Fatal(err)
+ }
if !bytes.Equal(actual, []byte(test.expect)) {
t.Errorf("Test %d: Expected: '%s' but got '%s'", i, test.expect, actual)
}