Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

caddyfile: Move NewTestDispenser into non-test file (#3439)

Browse source
This commit is contained in:
Francis Lavoie 2020-05-26 15:45:22 -04:00 committed by GitHub
parent 22055c5e0f
commit ffc125d6f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
caddyconfig/caddyfile/dispenser.go
View file

@ -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.

12
caddyconfig/caddyfile/dispenser_test.go
View file

@ -15,8 +15,6 @@
package caddyfile
import (
"io"
"log"
"reflect"
"strings"
"testing"
@ -306,13 +304,3 @@ func TestDispenser_ArgErr_Err(t *testing.T) {
t.Errorf("Expected error message with custom message in it ('foobar'); got '%v'", err)
}
}
// 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)
}