feat: loadSystemRoots use ExitCode to test cmd success

saferwall · Oct 30, 2024 · 3248242 · 3248242
1 parent a9e66f5
commit 3248242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/security.go b/security.go
@@ -467,11 +467,11 @@ func loadSystemRoots() (*x509.CertPool, error) {
 	if needSync {
 		cmd := exec.Command("certutil", "-syncWithWU", dir)
 		hideWindow(cmd)
-		out, err := cmd.Output()
+		err := cmd.Run()
 		if err != nil {
 			return roots, err
 		}
-		if !strings.Contains(string(out), "command completed successfully") {
+		if cmd.ProcessState.ExitCode() != 0 {
 			return roots, err
 		}
 	}

diff --git a/security_test.go b/security_test.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"path/filepath"
 	"reflect"
-	"runtime"
 	"testing"
 	"time"
 )
@@ -199,11 +198,10 @@ func TestParseSecurityDirectory(t *testing.T) {
 				if expected.SignatureValid != cert.SignatureValid {
 					t.Fatalf("signature verification %d failed, cert %v, want %v", i, cert.SignatureValid, expected.SignatureValid)
 				}
-				if runtime.GOOS == "linux" {
-					if expected.Verified != cert.Verified {
-						t.Fatalf("certificate verification %d failed, cert %v, want %v", i, cert.Verified, expected.Verified)
-					}
+				if expected.Verified != cert.Verified {
+					t.Fatalf("certificate verification %d failed, cert %v, want %v", i, cert.Verified, expected.Verified)
 				}
+
 			}
 		})
 	}