Optimize test code

Author: dmvolod

Diff for: cmd/clusterctl/cmd/plugin_test.go

@@ -37,43 +37,41 @@ const (
 )
 
 func Test_plugin(t *testing.T) {
-	g := NewWithT(t)
-	tt := []struct {
-		name     string
-		command  string
-		expected string
-	}{
-		{
-			name:     "base plugin command test",
-			expected: "I am a plugin named clusterctl-foo",
-		},
-		{
-			name:     "plugin version command test",
-			command:  "version",
-			expected: "1.0.0",
-		},
-	}
-
-	tmpDir := os.TempDir()
-	defer os.Remove(tmpDir)
-
-	pluginPath := filepath.Join(tmpDir, "clusterctl-foo")
-	path := os.Getenv("PATH")
-	g.Expect(os.WriteFile(pluginPath, []byte(pluginCode), 0755)).To(Succeed()) //nolint:gosec
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			g := NewWithT(t)
-			stdout, _, err := runForkTest("TestExecutePlugin", fmt.Sprintf("%s=%s", pluginCommandEnvVar, tc.command), fmt.Sprintf("PATH=%s:%s", tmpDir, path))
-			g.Expect(err).NotTo(HaveOccurred())
-			g.Expect(stdout).To(ContainSubstring(tc.expected))
-		})
-	}
-}
-
-func TestExecutePlugin(t *testing.T) {
 	if goutils.DefaultString(os.Getenv(forkEnvVar), "false") == strconv.FormatBool(false) {
-		t.Skip("FORK environment variable isn't set. Skipping test")
+		g := NewWithT(t)
+		tt := []struct {
+			name     string
+			command  string
+			expected string
+		}{
+			{
+				name:     "base plugin command test",
+				expected: "I am a plugin named clusterctl-foo",
+			},
+			{
+				name:     "plugin version command test",
+				command:  "version",
+				expected: "1.0.0",
+			},
+		}
+
+		tmpDir := os.TempDir()
+		defer os.Remove(tmpDir)
+
+		pluginPath := filepath.Join(tmpDir, "clusterctl-foo")
+		path := os.Getenv("PATH")
+		g.Expect(os.WriteFile(pluginPath, []byte(pluginCode), 0755)).To(Succeed()) //nolint:gosec
+
+		for _, tc := range tt {
+			t.Run(tc.name, func(t *testing.T) {
+				g := NewWithT(t)
+				stdout, _, err := runForkTest("Test_plugin", fmt.Sprintf("%s=%s", pluginCommandEnvVar, tc.command), fmt.Sprintf("PATH=%s:%s", tmpDir, path))
+				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(stdout).To(ContainSubstring(tc.expected))
+			})
+		}
+
+		return
 	}
 
 	os.Args = append(baseArgs, os.Getenv(pluginCommandEnvVar))