Skip to content

Commit

Permalink
fix integration tests for new dockerfile empty continuation warning o…
Browse files Browse the repository at this point in the history
…utput

Signed-off-by: Talon Bowler <talon.bowler@docker.com>
  • Loading branch information
daghack committed Mar 16, 2024
1 parent 9ea54fa commit 8554e91
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frontend/dockerfile/dockerfile2llb/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func toDispatchState(ctx context.Context, dt []byte, opt ConvertOpt) (*dispatchS
// lines, but we'll check the warning message to be sure.
if warning.URL == linter.RuleNoEmptyContinuations.URL {
location := []parser.Range{*warning.Location}
lintWarn(linter.RuleNoEmptyContinuations, "Empty Continuation Line", location)
lintWarn(linter.RuleNoEmptyContinuations, "Empty continuation line", location)
}
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/dockerfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6831,7 +6831,7 @@ COPY Dockerfile \

w := warnings[0]

require.Equal(t, "Empty continuation line found in: COPY Dockerfile .", string(w.Short))
require.Equal(t, "Empty continuation line (Dockerfile:5)", string(w.Short))
require.Equal(t, 1, len(w.Detail))
require.Equal(t, "Empty continuation lines will become errors in a future release", string(w.Detail[0]))
require.Equal(t, "https://github.com/moby/moby/pull/33719", w.URL)
Expand Down

0 comments on commit 8554e91

Please sign in to comment.