From ffc125d6f5606ab4370ea244e66dfb05cd78eb28 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Tue, 26 May 2020 15:45:22 -0400 Subject: caddyfile: Move NewTestDispenser into non-test file (#3439) --- caddyconfig/caddyfile/dispenser.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'caddyconfig/caddyfile/dispenser.go') diff --git a/caddyconfig/caddyfile/dispenser.go b/caddyconfig/caddyfile/dispenser.go index 932ab61..22cd3dc 100755 --- a/caddyconfig/caddyfile/dispenser.go +++ b/caddyconfig/caddyfile/dispenser.go @@ -17,6 +17,8 @@ package caddyfile import ( "errors" "fmt" + "io" + "log" "strings" ) @@ -37,6 +39,16 @@ func NewDispenser(tokens []Token) *Dispenser { } } +// NewTestDispenser parses input into tokens and creates a new +// Disenser for test purposes only; any errors are fatal. +func NewTestDispenser(input string) *Dispenser { + tokens, err := allTokens("Testfile", []byte(input)) + if err != nil && err != io.EOF { + log.Fatalf("getting all tokens from input: %v", err) + } + return NewDispenser(tokens) +} + // Next loads the next token. Returns true if a token // was loaded; false otherwise. If false, all tokens // have been consumed. -- cgit v1.2.3