Merge pull request #1252 from junnplus/fluentd-test

test fluentd log driver without build image

Author: AkihiroSuda

cmd/nerdctl/run_linux_test.go

@@ -273,66 +273,27 @@ func TestRunWithFluentdLogDriver(t *testing.T) {
 		t.Skip("fluentd log driver is not yet implemented on Windows")
 	}
 	base := testutil.NewBase(t)
-	imageName := "test-fluentd-image"
-	dockerfile := fmt.Sprintf(`
-FROM %s
-RUN rm -rf /fluentd/etc/test.conf && echo  -e '\
- <source>\n\
-   @type forward\n\
- </source>\n\
-\n\
- <match *>\n\
-   @type file\n\
-   path /data/fluentd\n\
-   append true\n\
-  <buffer>\n\
-    flush_mode immediate\n\
-  </buffer>\n\
- </match>\n\
-'>> /fluentd/etc/test.conf
-`, testutil.FluentdImage)
-	buildCtx, err := createBuildContext(dockerfile)
-	assert.NilError(t, err)
-	defer os.RemoveAll(buildCtx)
-	base.Cmd("build", "-t", imageName, buildCtx).AssertOK()
-	base.Cmd("build", buildCtx, "-t", imageName).AssertOK()
-	tempDirectory, err := os.MkdirTemp(t.TempDir(), "rw")
+	tempDirectory := t.TempDir()
+	err := os.Chmod(tempDirectory, 0777)
 	assert.NilError(t, err)
-	defer os.RemoveAll(tempDirectory)
-	err = os.Chmod(tempDirectory, 0777)
-	assert.NilError(t, err)
-	containerName := imageName + "container"
-	base.Cmd([]string{
-		"run",
-		"-d",
-		"--name",
-		containerName,
-		"-p",
-		"24224:24224",
-		"-v",
-		fmt.Sprintf("%s:/data", tempDirectory),
-		"-e",
-		"FLUENTD_CONF=test.conf",
-		imageName,
-	}...).AssertOK()
+
+	containerName := testutil.Identifier(t)
+	base.Cmd("run", "-d", "--name", containerName, "-p", "24224:24224",
+		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory), testutil.FluentdImage).AssertOK()
 	defer base.Cmd("rm", "-f", containerName).AssertOK()
-	defer base.Cmd("kill", containerName).AssertOK()
 	time.Sleep(3 * time.Second)
-	testContainerName := "test-container"
+
+	testContainerName := containerName + "test"
 	base.Cmd("run", "-d", "--log-driver", "fluentd", "--name", testContainerName, testutil.CommonImage,
 		"sh", "-c", "echo test").AssertOK()
 	defer base.Cmd("rm", "-f", testContainerName).AssertOK()
+
 	inspectedContainer := base.InspectContainer(testContainerName)
-	matches, err := filepath.Glob(tempDirectory + "/" + "*log")
+	matches, err := filepath.Glob(tempDirectory + "/" + "data.*.log")
 	assert.NilError(t, err)
 	assert.Equal(t, 1, len(matches))
-	logFile := matches[0]
-	defer os.Remove(logFile)
-	file, err := os.Open(logFile)
-	assert.NilError(t, err)
-	defer file.Close()
-	reader := bufio.NewReader(file)
-	data, _, err := reader.ReadLine()
+
+	data, err := os.ReadFile(matches[0])
 	assert.NilError(t, err)
 	logData := string(data)
 	assert.Equal(t, true, strings.Contains(logData, "test"))
@@ -344,76 +305,27 @@ func TestRunWithFluentdLogDriverWithLogOpt(t *testing.T) {
 		t.Skip("fluentd log driver is not yet implemented on Windows")
 	}
 	base := testutil.NewBase(t)
-	imageName := "test-fluentd-image"
-	dockerfile := fmt.Sprintf(`
-FROM %s
-RUN rm -rf /fluentd/etc/test.conf && echo  -e '\
- <source>\n\
-   @type forward\n\
- </source>\n\
-\n\
- <match *>\n\
-   @type file\n\
-   path /data/fluentd\n\
-   append true\n\
-  <buffer>\n\
-    flush_mode immediate\n\
-  </buffer>\n\
- </match>\n\
-'>> /fluentd/etc/test.conf
-`, testutil.FluentdImage)
-	buildCtx, err := createBuildContext(dockerfile)
-	assert.NilError(t, err)
-	defer os.RemoveAll(buildCtx)
-	base.Cmd("build", "-t", imageName, buildCtx).AssertOK()
-	base.Cmd("build", buildCtx, "-t", imageName).AssertOK()
-	tempDirectory, err := os.MkdirTemp(t.TempDir(), "rw")
+	tempDirectory := t.TempDir()
+	err := os.Chmod(tempDirectory, 0777)
 	assert.NilError(t, err)
-	defer os.RemoveAll(tempDirectory)
-	err = os.Chmod(tempDirectory, 0777)
-	assert.NilError(t, err)
-	containerName := imageName + "container"
-	base.Cmd([]string{
-		"run",
-		"-d",
-		"--name",
-		containerName,
-		"-p",
-		"24225:24224",
-		"-v",
-		fmt.Sprintf("%s:/data", tempDirectory),
-		"-e",
-		"FLUENTD_CONF=test.conf",
-		imageName,
-	}...).AssertOK()
+
+	containerName := testutil.Identifier(t)
+	base.Cmd("run", "-d", "--name", containerName, "-p", "24225:24224",
+		"-v", fmt.Sprintf("%s:/fluentd/log", tempDirectory), testutil.FluentdImage).AssertOK()
 	defer base.Cmd("rm", "-f", containerName).AssertOK()
-	defer base.Cmd("kill", containerName).AssertOK()
 	time.Sleep(3 * time.Second)
-	testContainerName := "test-container"
-	base.Cmd([]string{
-		"run",
-		"-d",
-		"--log-driver",
-		"fluentd",
-		"--log-opt",
-		"fluentd-address=127.0.0.1:24225",
-		"--name",
-		testContainerName,
-		testutil.CommonImage,
-		"sh", "-c", "echo test2",
-	}...).AssertOK()
+
+	testContainerName := containerName + "test"
+	base.Cmd("run", "-d", "--log-driver", "fluentd", "--log-opt", "fluentd-address=127.0.0.1:24225",
+		"--name", testContainerName, testutil.CommonImage, "sh", "-c", "echo test2").AssertOK()
 	defer base.Cmd("rm", "-f", testContainerName).AssertOK()
+
 	inspectedContainer := base.InspectContainer(testContainerName)
-	matches, err := filepath.Glob(tempDirectory + "/" + "*log")
+	matches, err := filepath.Glob(tempDirectory + "/" + "data.*.log")
 	assert.NilError(t, err)
 	assert.Equal(t, 1, len(matches))
-	logFile := matches[0]
-	defer os.Remove(logFile)
-	file, err := os.Open(logFile)
-	assert.NilError(t, err)
-	defer file.Close()
-	reader := bufio.NewReader(file)
-	data, _, err := reader.ReadLine()
+
+	data, err := os.ReadFile(matches[0])
 	assert.NilError(t, err)
 	logData := string(data)
 	assert.Equal(t, true, strings.Contains(logData, "test2"))