Refactor testing functions for Alpine compatibility by consolidating checks for Busybox and removing redundant conditions in stage_q4.go and stage_q5.go.

Author: andy1li

internal/stage7.go

@@ -70,7 +70,7 @@ func testType2(stageHarness *test_case_harness.TestCaseHarness) error {
 			expectedPath = filepath.Join(executableDir, myExeCommandName)
 
 			// Alpine Busybox has a bug where it doesn't check permissions
-			if isTestingTesterUsingAshOnAlpine(stageHarness) {
+			if isTestingTesterUsingBusyboxOnAlpine(stageHarness) {
 				expectedPath = nonExePath
 			}
 		}

internal/stage_q4.go

@@ -62,11 +62,6 @@ func testQ4(stageHarness *test_case_harness.TestCaseHarness) error {
 		fmt.Sprintf(`%s\\n%s`, L[4], L[1]),
 		fileContents[0] + fileContents[1] + strings.TrimRight(fileContents[2], "\n"),
 	}
-
-	if isTestingTesterUsingDashOnAlpine(stageHarness) {
-		expectedOutputs[1] = fmt.Sprintf(`%s"%s%s"%s`, L[2], L[3], L[4], L[0])
-	}
-
 	fallbackPatterns := [][]*regexp.Regexp{
 		{regexp.MustCompile(fmt.Sprintf(`%s\\n%s`, L[0], L[1]))},
 		nil,

internal/stage_q5.go

@@ -60,9 +60,6 @@ func testQ5(stageHarness *test_case_harness.TestCaseHarness) error {
 		fmt.Sprintf(`mixed"quote'%s'\`, L[4]),
 		fileContents[0] + fileContents[1] + strings.TrimRight(fileContents[2], "\n"),
 	}
-	if isTestingTesterUsingDashOnAlpine(stageHarness) {
-		expectedOutputs[0] = fmt.Sprintf(`%s'%s''%s`, L[0], L[1], L[2])
-	}
 	testCaseContents := newTestCaseContents(inputs, expectedOutputs)
 
 	for _, testCaseContent := range testCaseContents[:3] {

internal/utils_sys.go

@@ -10,22 +10,12 @@ import (
 const ASH_PATH = "internal/test_helpers/ash/your_shell.sh"
 const DASH_PATH = "internal/test_helpers/dash/your_shell.sh"
 
-func isTestingTesterUsingAshOnAlpine(stageHarness *test_case_harness.TestCaseHarness) bool {
+func isTestingTesterUsingBusyboxOnAlpine(stageHarness *test_case_harness.TestCaseHarness) bool {
 	path := stageHarness.Executable.Path
-	isTestingTesterUsingBusyboxAsh := strings.HasSuffix(path, ASH_PATH)
+	isTestingTesterUsingBusybox := strings.HasSuffix(path, ASH_PATH) || strings.HasSuffix(path, DASH_PATH)
 
 	_, err := os.Stat("/etc/alpine-release")
 	isOnAlpine := err == nil
 
-	return isTestingTesterUsingBusyboxAsh && isOnAlpine
-}
-
-func isTestingTesterUsingDashOnAlpine(stageHarness *test_case_harness.TestCaseHarness) bool {
-	path := stageHarness.Executable.Path
-	isTestingTesterUsingBusyboxDash := strings.HasSuffix(path, DASH_PATH)
-
-	_, err := os.Stat("/etc/alpine-release")
-	isOnAlpine := err == nil
-
-	return isTestingTesterUsingBusyboxDash && isOnAlpine
+	return isTestingTesterUsingBusybox && isOnAlpine
 }