Skip to content

Commit 9cb77a8

Browse files
fixes
1 parent ebb04e3 commit 9cb77a8

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,16 @@ jobs:
9595
run: |
9696
sudo apt-get update
9797
sudo apt-get install -y gnome-keyring dbus-x11
98-
# Start a dbus session
98+
# Start dbus session
9999
eval $(dbus-launch --sh-syntax)
100100
echo "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS" >> $GITHUB_ENV
101-
# Unlock the keyring with a known password
102-
echo "test" | gnome-keyring-daemon --unlock --components=secrets
103-
# Give it a moment to start
104-
sleep 1
101+
# Start gnome-keyring-daemon with default password
102+
eval $(echo "test" | gnome-keyring-daemon --start --daemonize --components=secrets)
103+
# Export the env vars for the daemon
104+
echo "GNOME_KEYRING_CONTROL=$GNOME_KEYRING_CONTROL" >> $GITHUB_ENV
105+
echo "GNOME_KEYRING_PID=$GNOME_KEYRING_PID" >> $GITHUB_ENV
106+
# Verify it's running
107+
ps aux | grep gnome-keyring-daemon | grep -v grep || echo "Warning: keyring daemon may not be running"
105108
106109
- name: Run integration tests
107110
run: make test-integration

internal/auth/keyring.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (k *systemKeyring) Set(service, user, password string) error {
7171

7272
func (k *systemKeyring) Delete(service, user string) error {
7373
err := k.ring.Remove(k.makeKey(service, user))
74-
if err == keyring.ErrKeyNotFound {
74+
if err == keyring.ErrKeyNotFound || os.IsNotExist(err) {
7575
return nil
7676
}
7777
return err

test/integration/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func keyringSet(service, user, password string) error {
8787
func keyringDelete(service, user string) error {
8888
key := fmt.Sprintf("%s/%s", service, user)
8989
err := testKeyring.Remove(key)
90-
if err == keyring.ErrKeyNotFound {
90+
if err == keyring.ErrKeyNotFound || os.IsNotExist(err) {
9191
return nil
9292
}
9393
return err

0 commit comments

Comments
 (0)