update 1

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

cmd/nerdctl/compose/compose_up_test.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"testing"
 
 	"gotest.tools/v3/assert"
@@ -84,6 +85,62 @@ services:
 	assert.Equal(t, "hi\n", string(testB))
 }
 
+// func TestComposeUpEnvFile(t *testing.T) {
+// 	if runtime.GOOS == "windows" {
+// 		t.Skip("Skipping test on Windows")
+// 	}
+
+// 	base := testutil.NewBase(t)
+
+// 	tmpDir := t.TempDir()
+// 	fmt.Printf("Created temporary directory: %s\n", tmpDir)
+
+// 	envFilePath := filepath.Join(tmpDir, ".env")
+// 	envFileContent := `
+// TEST_VAR1=Hello
+// TEST_VAR2=World
+// `
+// 	err := os.WriteFile(envFilePath, []byte(envFileContent), 0644)
+// 	assert.NilError(t, err)
+// 	fmt.Printf("Created .env file at: %s\n", envFilePath)
+// 	fmt.Printf("Env file content:\n%s\n", envFileContent)
+
+// 	dockerComposeYAML := fmt.Sprintf(`
+// version: '3'
+// services:
+//   test:
+//     image: %s
+//     command: sh -c 'echo $TEST_VAR1 $TEST_VAR2 > /tmp/test_output'
+// `, testutil.CommonImage)
+
+// 	comp := testutil.NewComposeDir(t, dockerComposeYAML)
+// 	defer comp.CleanUp()
+// 	fmt.Printf("Created docker-compose.yml at: %s\n", comp.YAMLFullPath())
+// 	fmt.Printf("Docker Compose YAML content:\n%s\n", dockerComposeYAML)
+
+// 	upCmd := base.ComposeCmd("--env-file", envFilePath, "-f", comp.YAMLFullPath(), "up", "-d")
+// 	upCmd.AssertOK()
+// 	time.Sleep(5 * time.Second)
+// 	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down").AssertOK()
+
+// 	psCmd := base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-a")
+// 	fmt.Printf("Compose ps output:\n%s\n", psCmd.Run().Combined())
+
+// 	containerID := strings.TrimSpace(base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-q").Out())
+// 	fmt.Printf("Container ID: %s\n", containerID)
+// 	if containerID == "" {
+// 		t.Fatalf("Failed to get container ID")
+// 	}
+
+// 	execCmd := base.Cmd("exec", containerID, "cat", "/tmp/test_output")
+// 	out := execCmd.Out()
+
+// 	fmt.Printf("Command output: %s\n", out)
+
+// 	assert.Equal(t, "Hello World\n", out)
+// 	fmt.Println("Test completed successfully")
+// }
+
 func TestComposeUpEnvFile(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skip("Skipping test on Windows")
@@ -112,7 +169,7 @@ version: '3'
 services:
   test:
     image: %s
-    command: sh -c 'echo $TEST_VAR1 $TEST_VAR2 > /tmp/test_output'
+    command: sh -c 'echo $TEST_VAR1 $TEST_VAR2 > /tmp/test_output && tail -f /dev/null'
 `, testutil.CommonImage)
 
 	comp := testutil.NewComposeDir(t, dockerComposeYAML)
@@ -121,24 +178,39 @@ services:
 	fmt.Printf("Docker Compose YAML content:\n%s\n", dockerComposeYAML)
 
 	// Run compose up with env-file
-	upCmd := base.ComposeCmd("-f", comp.YAMLFullPath(), "--env-file", envFilePath, "up", "-d")
-	upCmd.AssertOK()
-	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down").AssertOK()
+	upCmd := base.ComposeCmd("--env-file", envFilePath, "-f", comp.YAMLFullPath(), "up", "-d")
+	upResult := upCmd.Run()
+	fmt.Printf("Compose up result:\nExit Code: %d\nStdout:\n%s\nStderr:\n%s\n",
+		upResult.ExitCode, upResult.Stdout(), upResult.Stderr())
+
+	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down").Run()
+
+	// Print compose ps output
+	psCmd := base.ComposeCmd("-f", comp.YAMLFullPath(), "ps")
+	fmt.Printf("Compose ps output:\n%s\n", psCmd.Run().Combined())
 
 	// Print compose logs
 	logsCmd := base.ComposeCmd("-f", comp.YAMLFullPath(), "logs")
 	fmt.Printf("Compose logs:\n%s\n", logsCmd.Run().Combined())
 
-	// Get container ID
-	containerID := base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-q").OutLines()[0]
-	fmt.Printf("Container ID: %s\n", containerID)
+	// Check if the image exists
+	imageCmd := base.Cmd("images", testutil.CommonImage)
+	fmt.Printf("Image check result:\n%s\n", imageCmd.Run().Combined())
 
-	// Execute command in the container
-	execCmd := base.Cmd("exec", containerID, "cat", "/tmp/test_output")
-	out := execCmd.Out()
+	// Get container name
+	containerName := strings.TrimSpace(base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-q").Out())
+	fmt.Printf("Container Name/ID: %s\n", containerName)
+
+	if containerName == "" {
+		t.Fatalf("Failed to get container name/ID")
+	}
 
-	fmt.Printf("Command output: %s\n", out)
+	// Execute command in the container
+	execCmd := base.Cmd("exec", containerName, "cat", "/tmp/test_output")
+	execResult := execCmd.Run()
+	fmt.Printf("Exec result:\nExit Code: %d\nStdout:\n%s\nStderr:\n%s\n",
+		execResult.ExitCode, execResult.Stdout(), execResult.Stderr())
 
-	assert.Equal(t, "Hello World\n", out)
+	assert.Equal(t, "Hello World\n", execResult.Stdout())
 	fmt.Println("Test completed successfully")
 }