Browse code

integration-cli: DockerCLIBuildSuite: use more unique names for images

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2025/12/03 21:59:56
Showing 1 changed files
... ...
@@ -4051,7 +4051,7 @@ func (s *DockerCLIBuildSuite) TestBuildNullStringInAddCopyVolume(c *testing.T) {
4051 4051
 
4052 4052
 func (s *DockerCLIBuildSuite) TestBuildStopSignal(c *testing.T) {
4053 4053
 	testRequires(c, DaemonIsLinux) // Windows does not support STOPSIGNAL yet
4054
-	imgName := "test_build_stop_signal"
4054
+	imgName := strings.ToLower(c.Name())
4055 4055
 	cli.BuildCmd(c, imgName, build.WithDockerfile(`FROM busybox
4056 4056
 		 STOPSIGNAL SIGKILL`))
4057 4057
 	res := inspectFieldJSON(c, imgName, "Config.StopSignal")
... ...
@@ -4068,7 +4068,7 @@ func (s *DockerCLIBuildSuite) TestBuildStopSignal(c *testing.T) {
4068 4068
 }
4069 4069
 
4070 4070
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArg(c *testing.T) {
4071
-	imgName := "bldargtest"
4071
+	imgName := strings.ToLower(c.Name())
4072 4072
 	envKey := "foo"
4073 4073
 	envVal := "bar"
4074 4074
 	var dockerfile string
... ...
@@ -4100,7 +4100,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArg(c *testing.T) {
4100 4100
 }
4101 4101
 
4102 4102
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgHistory(c *testing.T) {
4103
-	imgName := "bldargtest"
4103
+	imgName := strings.ToLower(c.Name())
4104 4104
 	envKey := "foo"
4105 4105
 	envVal := "bar"
4106 4106
 	envDef := "bar1"
... ...
@@ -4121,7 +4121,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgHistory(c *testing.T) {
4121 4121
 }
4122 4122
 
4123 4123
 func (s *DockerCLIBuildSuite) TestBuildTimeArgHistoryExclusions(c *testing.T) {
4124
-	imgName := "bldargtest"
4124
+	imgName := strings.ToLower(c.Name())
4125 4125
 	envKey := "foo"
4126 4126
 	envVal := "bar"
4127 4127
 	proxy := "HTTP_PROXY=http://user:password@proxy.example.com"
... ...
@@ -4161,7 +4161,7 @@ func (s *DockerCLIBuildSuite) TestBuildTimeArgHistoryExclusions(c *testing.T) {
4161 4161
 }
4162 4162
 
4163 4163
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgCacheHit(c *testing.T) {
4164
-	imgName := "bldargtest"
4164
+	imgName := strings.ToLower(c.Name())
4165 4165
 	envKey := "foo"
4166 4166
 	envVal := "bar"
4167 4167
 	dockerfile := fmt.Sprintf(`FROM busybox
... ...
@@ -4216,7 +4216,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgCacheMissExtraArg(c *testing.
4216 4216
 }
4217 4217
 
4218 4218
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgCacheMissSameArgDiffVal(c *testing.T) {
4219
-	imgName := "bldargtest"
4219
+	imgName := strings.ToLower(c.Name())
4220 4220
 	envKey := "foo"
4221 4221
 	envVal := "bar"
4222 4222
 	newEnvVal := "bar1"
... ...
@@ -4242,7 +4242,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgCacheMissSameArgDiffVal(c *te
4242 4242
 
4243 4243
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgOverrideArgDefinedBeforeEnv(c *testing.T) {
4244 4244
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4245
-	imgName := "bldargtest"
4245
+	imgName := strings.ToLower(c.Name())
4246 4246
 	envKey := "foo"
4247 4247
 	envVal := "bar"
4248 4248
 	envValOverride := "barOverride"
... ...
@@ -4271,7 +4271,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgOverrideArgDefinedBeforeEnv(c
4271 4271
 // FIXME(vdemeester) might be useful to merge with the one above ?
4272 4272
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgOverrideEnvDefinedBeforeArg(c *testing.T) {
4273 4273
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4274
-	imgName := "bldargtest"
4274
+	imgName := strings.ToLower(c.Name())
4275 4275
 	envKey := "foo"
4276 4276
 	envVal := "bar"
4277 4277
 	envValOverride := "barOverride"
... ...
@@ -4297,7 +4297,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgOverrideEnvDefinedBeforeArg(c
4297 4297
 }
4298 4298
 
4299 4299
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgExpansion(c *testing.T) {
4300
-	imgName := "bldvarstest"
4300
+	imgName := strings.ToLower(c.Name())
4301 4301
 
4302 4302
 	wdVar := "WDIR"
4303 4303
 	wdVal := "/tmp"
... ...
@@ -4388,7 +4388,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgExpansion(c *testing.T) {
4388 4388
 
4389 4389
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgExpansionOverride(c *testing.T) {
4390 4390
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4391
-	imgName := "bldvarstest"
4391
+	imgName := strings.ToLower(c.Name())
4392 4392
 	envKey := "foo"
4393 4393
 	envVal := "bar"
4394 4394
 	envKey1 := "foo1"
... ...
@@ -4416,7 +4416,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgExpansionOverride(c *testing.
4416 4416
 
4417 4417
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgUntrustedDefinedAfterUse(c *testing.T) {
4418 4418
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4419
-	imgName := "bldargtest"
4419
+	imgName := strings.ToLower(c.Name())
4420 4420
 	envKey := "foo"
4421 4421
 	envVal := "bar"
4422 4422
 	dockerfile := fmt.Sprintf(`FROM busybox
... ...
@@ -4440,7 +4440,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgUntrustedDefinedAfterUse(c *t
4440 4440
 
4441 4441
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgBuiltinArg(c *testing.T) {
4442 4442
 	testRequires(c, DaemonIsLinux) // Windows does not support --build-arg
4443
-	imgName := "bldargtest"
4443
+	imgName := strings.ToLower(c.Name())
4444 4444
 	envKey := "HTTP_PROXY"
4445 4445
 	envVal := "bar"
4446 4446
 	dockerfile := fmt.Sprintf(`FROM busybox
... ...
@@ -4463,7 +4463,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgBuiltinArg(c *testing.T) {
4463 4463
 
4464 4464
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgDefaultOverride(c *testing.T) {
4465 4465
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4466
-	imgName := "bldargtest"
4466
+	imgName := strings.ToLower(c.Name())
4467 4467
 	envKey := "foo"
4468 4468
 	envVal := "bar"
4469 4469
 	envValOverride := "barOverride"
... ...
@@ -4488,7 +4488,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgDefaultOverride(c *testing.T)
4488 4488
 }
4489 4489
 
4490 4490
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgUnconsumedArg(c *testing.T) {
4491
-	imgName := "bldargtest"
4491
+	imgName := strings.ToLower(c.Name())
4492 4492
 	envKey := "foo"
4493 4493
 	envVal := "bar"
4494 4494
 	dockerfile := fmt.Sprintf(`FROM busybox
... ...
@@ -4564,7 +4564,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgEnv(c *testing.T) {
4564 4564
 }
4565 4565
 
4566 4566
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgQuotedValVariants(c *testing.T) {
4567
-	imgName := "bldargtest"
4567
+	imgName := strings.ToLower(c.Name())
4568 4568
 	envKey := "foo"
4569 4569
 	envKey1 := "foo1"
4570 4570
 	envKey2 := "foo2"
... ...
@@ -4586,7 +4586,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgQuotedValVariants(c *testing.
4586 4586
 
4587 4587
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgEmptyValVariants(c *testing.T) {
4588 4588
 	testRequires(c, DaemonIsLinux) // Windows does not support ARG
4589
-	imgName := "bldargtest"
4589
+	imgName := strings.ToLower(c.Name())
4590 4590
 	envKey := "foo"
4591 4591
 	envKey1 := "foo1"
4592 4592
 	envKey2 := "foo2"
... ...
@@ -4601,7 +4601,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgEmptyValVariants(c *testing.T
4601 4601
 }
4602 4602
 
4603 4603
 func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgDefinitionWithNoEnvInjection(c *testing.T) {
4604
-	imgName := "bldargtest"
4604
+	imgName := strings.ToLower(c.Name())
4605 4605
 	envKey := "foo"
4606 4606
 	dockerfile := fmt.Sprintf(`FROM busybox
4607 4607
 		ARG %s
... ...
@@ -4615,7 +4615,7 @@ func (s *DockerCLIBuildSuite) TestBuildBuildTimeArgDefinitionWithNoEnvInjection(
4615 4615
 }
4616 4616
 
4617 4617
 func (s *DockerCLIBuildSuite) TestBuildMultiStageArg(c *testing.T) {
4618
-	imgName := "multifrombldargtest"
4618
+	imgName := strings.ToLower(c.Name())
4619 4619
 	dockerfile := `FROM busybox
4620 4620
     ARG foo=abc
4621 4621
     LABEL multifromtest=1
... ...
@@ -4643,7 +4643,7 @@ func (s *DockerCLIBuildSuite) TestBuildMultiStageArg(c *testing.T) {
4643 4643
 }
4644 4644
 
4645 4645
 func (s *DockerCLIBuildSuite) TestBuildMultiStageGlobalArg(c *testing.T) {
4646
-	imgName := "multifrombldargtest"
4646
+	imgName := strings.ToLower(c.Name())
4647 4647
 	dockerfile := `ARG tag=nosuchtag
4648 4648
      FROM busybox:${tag}
4649 4649
      LABEL multifromtest2=1
... ...
@@ -4672,7 +4672,7 @@ func (s *DockerCLIBuildSuite) TestBuildMultiStageGlobalArg(c *testing.T) {
4672 4672
 }
4673 4673
 
4674 4674
 func (s *DockerCLIBuildSuite) TestBuildMultiStageUnusedArg(c *testing.T) {
4675
-	imgName := "multifromunusedarg"
4675
+	imgName := strings.ToLower(c.Name())
4676 4676
 	dockerfile := `FROM busybox
4677 4677
     ARG foo
4678 4678
     FROM busybox
... ...
@@ -4691,6 +4691,7 @@ func (s *DockerCLIBuildSuite) TestBuildMultiStageUnusedArg(c *testing.T) {
4691 4691
 }
4692 4692
 
4693 4693
 func (s *DockerCLIBuildSuite) TestBuildNoNamedVolume(c *testing.T) {
4694
+	imgName := strings.ToLower(c.Name())
4694 4695
 	volName := "testname:/foo"
4695 4696
 
4696 4697
 	if testEnv.DaemonInfo.OSType == "windows" {
... ...
@@ -4702,23 +4703,25 @@ func (s *DockerCLIBuildSuite) TestBuildNoNamedVolume(c *testing.T) {
4702 4702
 	VOLUME ` + volName + `
4703 4703
 	RUN ls /foo/oops
4704 4704
 	`
4705
-	cli.Docker(cli.Args("build", "-t", "test"), build.WithDockerfile(dockerFile)).Assert(c, icmd.Expected{
4705
+
4706
+	cli.Docker(cli.Args("build", "-t", imgName), build.WithDockerfile(dockerFile)).Assert(c, icmd.Expected{
4706 4707
 		ExitCode: 1,
4707 4708
 	})
4708 4709
 }
4709 4710
 
4710 4711
 func (s *DockerCLIBuildSuite) TestBuildTagEvent(c *testing.T) {
4712
+	imgName := strings.ToLower(c.Name())
4711 4713
 	since := daemonUnixTime(c)
4712 4714
 
4713 4715
 	dockerFile := `FROM busybox
4714 4716
 	RUN echo events
4715 4717
 	`
4716
-	cli.BuildCmd(c, "test", build.WithDockerfile(dockerFile))
4718
+	cli.BuildCmd(c, imgName, build.WithDockerfile(dockerFile))
4717 4719
 
4718 4720
 	until := daemonUnixTime(c)
4719 4721
 	out := cli.DockerCmd(c, "events", "--since", since, "--until", until, "--filter", "type=image").Stdout()
4720 4722
 	events := strings.Split(strings.TrimSpace(out), "\n")
4721
-	actions := eventActionsByIDAndType(c, events, "test:latest", "image")
4723
+	actions := eventActionsByIDAndType(c, events, imgName+":latest", "image")
4722 4724
 	var foundTag bool
4723 4725
 	for _, a := range actions {
4724 4726
 		if a == "tag" {
... ...
@@ -6041,7 +6044,7 @@ func (s *DockerCLIBuildSuite) TestBuildWindowsEnvCaseInsensitive(c *testing.T) {
6041 6041
 
6042 6042
 // Test case for 29667
6043 6043
 func (s *DockerCLIBuildSuite) TestBuildWorkdirImageCmd(c *testing.T) {
6044
-	imgName := "testworkdirimagecmd"
6044
+	imgName := strings.ToLower(c.Name())
6045 6045
 	cli.BuildCmd(c, imgName, build.WithDockerfile(`
6046 6046
 FROM busybox
6047 6047
 WORKDIR /foo/bar