yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

feat(BRIDGE-281): disable keychain test on macOS.

Browse Source 
(cherry picked from commit 3f78f4d672)
This commit is contained in:
Xavier Michelon
2024-11-29 09:14:29 +01:00
parent a8caec560e
commit 7cf3b6fb7b
9 changed files with 25 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/keychain/helper_darwin.go
View File

@ -31,21 +31,12 @@ const (
MacOSKeychain = "macos-keychain"
)
func listHelpers(skipKeychainTest bool) (Helpers, string) {
func listHelpers() (Helpers, string) {
helpers := make(Helpers)
// MacOS always provides a keychain.
if skipKeychainTest {
logrus.WithField("pkg", "keychain").Info("Skipping macOS keychain test")
helpers[MacOSKeychain] = newMacOSHelper
} else {
if isUsable(newMacOSHelper("")) {
helpers[MacOSKeychain] = newMacOSHelper
logrus.WithField("keychain", "MacOSKeychain").Info("Keychain is usable.")
} else {
logrus.WithField("keychain", "MacOSKeychain").Debug("Keychain is not available.")
}
}
logrus.WithField("pkg", "keychain").Info("Skipping macOS keychain test")
helpers[MacOSKeychain] = newMacOSHelper
// Use MacOSKeychain by default.
return helpers, MacOSKeychain