Skip to content

Commit 7c4c504

Browse files
chore: fix gpg forwarding test (cherry-pick #17355) (#17429)
Cherry-picked chore: fix gpg forwarding test (#17355) Co-authored-by: Dean Sheather <dean@deansheather.com>
1 parent 17dbb51 commit 7c4c504

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,6 @@ result
7878

7979
# Zed
8080
.zed_server
81+
82+
# dlv debug binaries for go tests
83+
__debug_bin*

cli/ssh_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,9 @@ Expire-Date: 0
18431843
tpty.WriteLine("gpg --list-keys && echo gpg-''-listkeys-command-done")
18441844
listKeysOutput := tpty.ExpectMatch("gpg--listkeys-command-done")
18451845
require.Contains(t, listKeysOutput, "[ultimate] Coder Test <test@coder.com>")
1846-
require.Contains(t, listKeysOutput, "[ultimate] Dean Sheather (work key) <dean@coder.com>")
1846+
// It's fine that this key is expired. We're just testing that the key trust
1847+
// gets synced properly.
1848+
require.Contains(t, listKeysOutput, "[ expired] Dean Sheather (work key) <dean@coder.com>")
18471849

18481850
// Try to sign something. This demonstrates that the forwarding is
18491851
// working as expected, since the workspace doesn't have access to the

0 commit comments

Comments
 (0)