Enhance integration tests and improve error handling

- Added runtime checks for binary creation in `integration_test.go` to support Windows compatibility.
- Improved error handling in the Makefile installation test by logging non-fatal errors during cleanup.
- Updated the binary path in `testutil.go` to accommodate Windows executable naming conventions.
- Removed unnecessary code in `bsl_test.go` to streamline test logic.

Author: Joeavaikath

cmd/non-admin/bsl/bsl_test.go

@@ -83,7 +83,6 @@ func TestBSLNoLongerHasRequestCommands(t *testing.T) {
 				continue
 			}
 			if inAvailableCommands && strings.Contains(line, "Flags:") {
-				inAvailableCommands = false
 				break
 			}
 			if inAvailableCommands && strings.Contains(strings.TrimSpace(line), "request") {

cmd/non-admin/nonadmin.go

@@ -40,4 +40,3 @@ func NewNonAdminCommand(f client.Factory) *cobra.Command {
 
 	return c
 }
-

integration_test.go

@@ -19,6 +19,7 @@ package main
 import (
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -46,7 +47,11 @@ func TestMakefileInstallation(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to get current directory: %v", err)
 	}
-	defer os.Chdir(originalDir)
+	defer func() {
+		if err := os.Chdir(originalDir); err != nil {
+			t.Logf("Failed to restore original directory: %v", err)
+		}
+	}()
 
 	err = os.Chdir(projectRoot)
 	if err != nil {
@@ -76,7 +81,9 @@ func TestMakefileInstallation(t *testing.T) {
 
 	t.Run("make build works", func(t *testing.T) {
 		// Clean first
-		exec.Command("make", "clean").Run()
+		if err := exec.Command("make", "clean").Run(); err != nil {
+			t.Logf("Failed to clean (non-fatal): %v", err)
+		}
 
 		cmd := exec.Command("make", "build")
 		output, err := cmd.CombinedOutput()
@@ -85,12 +92,16 @@ func TestMakefileInstallation(t *testing.T) {
 		}
 
 		// Check binary was created
-		if _, err := os.Stat("kubectl-oadp"); os.IsNotExist(err) {
-			t.Errorf("Binary kubectl-oadp was not created")
+		binaryName := "kubectl-oadp"
+		if runtime.GOOS == "windows" {
+			binaryName += ".exe"
+		}
+		if _, err := os.Stat(binaryName); os.IsNotExist(err) {
+			t.Errorf("Binary %s was not created", binaryName)
 		}
 
 		// Cleanup
-		os.Remove("kubectl-oadp")
+		os.Remove(binaryName)
 	})
 }
 

internal/testutil/testutil.go

@@ -67,7 +67,11 @@ func BuildCLIBinary(t *testing.T) string {
 
 	// Create temp directory for the binary
 	tempDir := t.TempDir()
-	binaryPath := filepath.Join(tempDir, "oadp-test")
+	binaryName := "oadp-test"
+	if runtime.GOOS == "windows" {
+		binaryName += ".exe"
+	}
+	binaryPath := filepath.Join(tempDir, binaryName)
 
 	t.Logf("Building CLI binary: %s", binaryPath)
 	t.Logf("Project root: %s", projectRoot)