fix test failing

mackerelio · Mar 26, 2017 · 0c05a0f · 0c05a0f
1 parent e1276e1
commit 0c05a0f
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/util/util_windows.go b/util/util_windows.go
@@ -42,18 +42,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