Fix shells TestPowershell_GetConfiguration on Windows

saracen · saracen · commit 3de1422e3d7b · 2023-03-27T16:40:02.000+01:00
diff --git a/ci/.test-failures.servercore1809.txt b/ci/.test-failures.servercore1809.txt
@@ -1,4 +1,2 @@
 TestBuildCancel
 TestBuildCancel/cmd
-TestPowershell_GetConfiguration
-TestPowershell_GetConfiguration/pwsh_on_shell_with_custom_user_(windows)
diff --git a/ci/.test-failures.servercore2004.txt b/ci/.test-failures.servercore2004.txt
@@ -1,4 +1,2 @@
-TestPowershell_GetConfiguration
-TestPowershell_GetConfiguration/pwsh_on_shell_with_custom_user_(windows)
 TestBuildCancel
 TestBuildCancel/cmd
diff --git a/ci/.test-failures.servercore20H2.txt b/ci/.test-failures.servercore20H2.txt
@@ -1,5 +1,3 @@
-TestPowershell_GetConfiguration
-TestPowershell_GetConfiguration/pwsh_on_shell_with_custom_user_(windows)
 TestDockerServiceHealthcheck
 TestDockerServiceHealthcheck/successful_service_(FF_NETWORK_PER_BUILD=true)
 TestDockerServiceHealthcheck/failed_service_(FF_NETWORK_PER_BUILD=true)
diff --git a/ci/.test-failures.servercore21H1.txt b/ci/.test-failures.servercore21H1.txt
@@ -1,4 +1,2 @@
-TestPowershell_GetConfiguration
-TestPowershell_GetConfiguration/pwsh_on_shell_with_custom_user_(windows)
 TestBuildCancel
 TestBuildCancel/cmd
diff --git a/shells/powershell_test.go b/shells/powershell_test.go
@@ -216,7 +216,7 @@ func TestPowershell_GetConfiguration(t *testing.T) {
 			expectedCommand:  "su",
 			expectedCmdLine:  "su custom -c " + pwshStdinExpectedLine,
 			getExpectedArguments: func(shell string) []string {
-				return []string{"-s", "custom", "-c", SNPwsh + " " + strings.Join(stdinCmdArgs(shell), " ")}
+				return []string{"custom", "-c", SNPwsh + " " + strings.Join(stdinCmdArgs(shell), " ")}
 			},
 		},
 		"powershell on shell - FF_DISABLE_POWERSHELL_STDIN true": {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-TestPowershell_GetConfiguration`
`2`		`-TestPowershell_GetConfiguration/pwsh_on_shell_with_custom_user_(windows)`
`3`	`1`	`TestDockerServiceHealthcheck`
`4`	`2`	`TestDockerServiceHealthcheck/successful_service_(FF_NETWORK_PER_BUILD=true)`
`5`	`3`	`TestDockerServiceHealthcheck/failed_service_(FF_NETWORK_PER_BUILD=true)`