Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
caddyfile: Move NewTestDispenser into non-test file (#3439)
Francis Lavoie committed
May 26, 2020 at 15:45 UTC
ffc125d6f5606ab4370ea244e66dfb05cd78eb28
2 files changed
+12
-12
caddyconfig/caddyfile/dispenser.go
+12
@@ -17,6 +17,8 @@ package caddyfile
17
import (
18
"errors"
19
"fmt"
20
+ "io"
21
+ "log"
22
"strings"
23
)
24
@@ -37,6 +39,16 @@ func NewDispenser(tokens []Token) *Dispenser {
39
}
40
}
41
42
+// NewTestDispenser parses input into tokens and creates a new
43
+// Disenser for test purposes only; any errors are fatal.
44
+func NewTestDispenser(input string) *Dispenser {
45
+ tokens, err := allTokens("Testfile", []byte(input))
46
+ if err != nil && err != io.EOF {
47
+ log.Fatalf("getting all tokens from input: %v", err)
48
+ }
49
+ return NewDispenser(tokens)
50
+}
51
+
52
// Next loads the next token. Returns true if a token
53
// was loaded; false otherwise. If false, all tokens
54
// have been consumed.
caddyconfig/caddyfile/dispenser_test.go
-12
@@ -15,8 +15,6 @@
15
package caddyfile
16
17
import (
18
- "io"
19
- "log"
18
"reflect"
19
"strings"
20
"testing"
@@ -306,13 +304,3 @@ func TestDispenser_ArgErr_Err(t *testing.T) {
304
t.Errorf("Expected error message with custom message in it ('foobar'); got '%v'", err)
305
}
306
}
309
-
310
-// NewTestDispenser parses input into tokens and creates a new
311
-// Disenser for test purposes only; any errors are fatal.
312
-func NewTestDispenser(input string) *Dispenser {
313
- tokens, err := allTokens("Testfile", []byte(input))
314
- if err != nil && err != io.EOF {
315
- log.Fatalf("getting all tokens from input: %v", err)
316
- }
317
- return NewDispenser(tokens)
318
-}