Skip to content

Commit

Permalink
fix test failing
Browse files Browse the repository at this point in the history
  • Loading branch information
Songmu committed Mar 26, 2017
1 parent e1276e1 commit 2c06539
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions util/util_windows.go
Expand Up @@ -5,7 +5,6 @@ import (
"os/exec"
"strconv"
"strings"
"syscall"
"time"

"github.com/Songmu/timeout"
Expand Down Expand Up @@ -42,18 +41,7 @@ func RunCommandArgs(cmdArgs []string, user string) (string, string, int, error)
if err == nil && exitStatus.IsTimedOut() {
err = fmt.Errorf("command timed out")
}

if err != nil {
if exitErr, ok := err.(*exec.ExitError); ok {
if waitStatus, ok := exitErr.Sys().(syscall.WaitStatus); ok {
exitCode := waitStatus.ExitStatus()
return stdout, stderr, exitCode, nil
}
}
return stdout, stderr, -1, err
}

return stdout, stderr, 0, nil
return stdout, stderr, exitStatus.GetChildExitCode(), err
}

// GetWmic XXX
Expand Down

0 comments on commit 2c06539

Please sign in to comment.