beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix issue with test ordering for TestParseWords

Browse source 
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.

This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-07-26 10:03:47 -04:00
parent 42f2205184
commit df167d3ff0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/dockerfile/parser/parser.go
View file

@ -36,19 +36,19 @@ type Node struct {
EndLine int // the line in the original dockerfile where the node ends EndLine int // the line in the original dockerfile where the node ends
} }
const defaultTokenEscape = "\\"
var ( var (
dispatch map[string]func(string) (*Node, map[string]bool, error) dispatch map[string]func(string) (*Node, map[string]bool, error)
tokenWhitespace = regexp.MustCompile(`[\t\v\f\r ]+`) tokenWhitespace = regexp.MustCompile(`[\t\v\f\r ]+`)
tokenLineContinuation *regexp.Regexp tokenLineContinuation *regexp.Regexp
tokenEscape rune tokenEscape = rune(defaultTokenEscape[0])
tokenEscapeCommand = regexp.MustCompile(`^#[ \t]*escape[ \t]*=[ \t]*(?P<escapechar>.).*$`) tokenEscapeCommand = regexp.MustCompile(`^#[ \t]*escape[ \t]*=[ \t]*(?P<escapechar>.).*$`)
tokenComment = regexp.MustCompile(`^#.*$`) tokenComment = regexp.MustCompile(`^#.*$`)
lookingForDirectives bool lookingForDirectives bool
directiveEscapeSeen bool directiveEscapeSeen bool
) )
const defaultTokenEscape = "\\"
// setTokenEscape sets the default token for escaping characters in a Dockerfile. // setTokenEscape sets the default token for escaping characters in a Dockerfile.
func setTokenEscape(s string) error { func setTokenEscape(s string) error {
if s != "`" && s != "\\" { if s != "`" && s != "\\" {

4
builder/dockerfile/parser/parser_test.go
View file

@ -121,11 +121,11 @@ func TestParseWords(t *testing.T) {
for _, test := range tests { for _, test := range tests {
words := parseWords(test["input"][0]) words := parseWords(test["input"][0])
if len(words) != len(test["expect"]) { if len(words) != len(test["expect"]) {
t.Fatalf("length check failed. input: %v, expect: %v, output: %v", test["input"][0], test["expect"], words) t.Fatalf("length check failed. input: %v, expect: %q, output: %q", test["input"][0], test["expect"], words)
} }
for i, word := range words { for i, word := range words {
if word != test["expect"][i] { if word != test["expect"][i] {
t.Fatalf("word check failed for word: %q. input: %v, expect: %v, output: %v", word, test["input"][0], test["expect"], words) t.Fatalf("word check failed for word: %q. input: %q, expect: %q, output: %q", word, test["input"][0], test["expect"], words)
} }
} }
} }