This old test is failing after an edge-case change in dockerfile
parsing considered a bugfix: https://github.com/moby/buildkit/pull/1559
Instead of fixing the test, I suggest removing it as there are already
tests for it in BuildKit.
Signed-off-by: Tibor Vass <tibor@docker.com>
| ... | ... |
@@ -5608,30 +5608,6 @@ func (s *DockerSuite) TestBuildWithExtraHostInvalidFormat(c *testing.T) {
|
| 5608 | 5608 |
|
| 5609 | 5609 |
} |
| 5610 | 5610 |
|
| 5611 |
-func (s *DockerSuite) TestBuildContChar(c *testing.T) {
|
|
| 5612 |
- name := "testbuildcontchar" |
|
| 5613 |
- |
|
| 5614 |
- buildImage(name, build.WithDockerfile(`FROM busybox\`)).Assert(c, icmd.Expected{
|
|
| 5615 |
- Out: "Step 1/1 : FROM busybox", |
|
| 5616 |
- }) |
|
| 5617 |
- |
|
| 5618 |
- result := buildImage(name, build.WithDockerfile(`FROM busybox |
|
| 5619 |
- RUN echo hi \`)) |
|
| 5620 |
- result.Assert(c, icmd.Success) |
|
| 5621 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 1/2 : FROM busybox")) |
|
| 5622 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 2/2 : RUN echo hi\n")) |
|
| 5623 |
- result = buildImage(name, build.WithDockerfile(`FROM busybox |
|
| 5624 |
- RUN echo hi \\`)) |
|
| 5625 |
- result.Assert(c, icmd.Success) |
|
| 5626 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 1/2 : FROM busybox")) |
|
| 5627 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 2/2 : RUN echo hi \\\n")) |
|
| 5628 |
- result = buildImage(name, build.WithDockerfile(`FROM busybox |
|
| 5629 |
- RUN echo hi \\\`)) |
|
| 5630 |
- result.Assert(c, icmd.Success) |
|
| 5631 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 1/2 : FROM busybox")) |
|
| 5632 |
- assert.Assert(c, strings.Contains(result.Combined(), "Step 2/2 : RUN echo hi \\\\\n")) |
|
| 5633 |
-} |
|
| 5634 |
- |
|
| 5635 | 5611 |
func (s *DockerSuite) TestBuildMultiStageCopyFromSyntax(c *testing.T) {
|
| 5636 | 5612 |
dockerfile := ` |
| 5637 | 5613 |
FROM busybox AS first |