extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-21 18:22:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining tests

Browse Source
This commit is contained in:
Viktor Liu 2025-06-20 01:00:05 +02:00
parent 6c967d1c27
commit 633e477630
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/ssh/client.go
View File

@ -81,7 +81,8 @@ func (c *Client) handleSessionError(err error) error {
} }
var e *ssh.ExitError var e *ssh.ExitError
if !errors.As(err, &e) { var em *ssh.ExitMissingError
if !errors.As(err, &e) && !errors.As(err, &em) {
// Only return actual errors (not exit status errors) // Only return actual errors (not exit status errors)
return fmt.Errorf("session wait: %w", err) return fmt.Errorf("session wait: %w", err)
} }
@ -89,6 +90,7 @@ func (c *Client) handleSessionError(err error) error {
// SSH should behave like regular command execution: // SSH should behave like regular command execution:
// Non-zero exit codes are normal and should not be treated as errors // Non-zero exit codes are normal and should not be treated as errors
// The command ran successfully, it just returned a non-zero exit code // The command ran successfully, it just returned a non-zero exit code
// ExitMissingError is also normal - session was torn down cleanly
return nil return nil
} }
@ -116,12 +118,14 @@ func (c *Client) ExecuteCommand(ctx context.Context, command string) ([]byte, er
output, err := session.CombinedOutput(command) output, err := session.CombinedOutput(command)
if err != nil { if err != nil {
var e *ssh.ExitError var e *ssh.ExitError
if !errors.As(err, &e) { var em *ssh.ExitMissingError
if !errors.As(err, &e) && !errors.As(err, &em) {
// Only return actual errors (not exit status errors) // Only return actual errors (not exit status errors)
return output, fmt.Errorf("execute command: %w", err) return output, fmt.Errorf("execute command: %w", err)
} }
// SSH should behave like regular command execution: // SSH should behave like regular command execution:
// Non-zero exit codes are normal and should not be treated as errors // Non-zero exit codes are normal and should not be treated as errors
// ExitMissingError is also normal - session was torn down cleanly
// Return the output even for non-zero exit codes // Return the output even for non-zero exit codes
} }
@ -210,10 +214,14 @@ func (c *Client) handleCommandError(err error) error {
} }
var e *ssh.ExitError var e *ssh.ExitError
if !errors.As(err, &e) { var em *ssh.ExitMissingError
if !errors.As(err, &e) && !errors.As(err, &em) {
return fmt.Errorf("execute command: %w", err) return fmt.Errorf("execute command: %w", err)
} }
// SSH should behave like regular command execution:
// Non-zero exit codes are normal and should not be treated as errors
// ExitMissingError is also normal - session was torn down cleanly
return nil return nil
} }

14
client/ssh/client_test.go
View File

@ -613,7 +613,7 @@ func TestSSHClient_PipedCommand(t *testing.T) {
// Test with piped commands that don't require PTY // Test with piped commands that don't require PTY
var pipeCmd string var pipeCmd string
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
pipeCmd = "echo hello world | findstr hello" pipeCmd = "echo hello world | Select-String hello"
} else { } else {
pipeCmd = "echo 'hello world' | grep hello" pipeCmd = "echo 'hello world' | grep hello"
} }
@ -1112,9 +1112,9 @@ func TestBehaviorRegression(t *testing.T) {
command string command string
}{ }{
{"simple echo", "echo test"}, {"simple echo", "echo test"},
{"current directory", "cd"}, {"current directory", "Get-Location"},
{"list files", "dir"}, {"list files", "Get-ChildItem"},
{"system info", "systeminfo | findstr /B /C:\"OS Name\""}, {"system info", "$PSVersionTable.PSVersion"},
} }
} else { } else {
testCases = []struct { testCases = []struct {
@ -1231,9 +1231,9 @@ func TestSSHClient_NonZeroExitCodes(t *testing.T) {
name string name string
command string command string
}{ }{
{"findstr no match", "echo hello | findstr notfound"}, {"select-string no match", "echo hello | Select-String notfound"},
{"exit 1 command", "cmd /c exit 1"}, {"exit 1 command", "throw \"exit with code 1\""},
{"dir nonexistent", "dir C:\\nonexistent\\path"}, {"get-childitem nonexistent", "Get-ChildItem C:\\nonexistent\\path"},
} }
} else { } else {
testCases = []struct { testCases = []struct {