synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve shell compatibility of netstat check in test (#16141)

Browse Source 
When I wrote the original just the other day, I used `$?`, which is fine
on CI and in most cases, but not when the person running the test has
their system shell set to fish (Fish uses $status) instead. In the
interest of letting this test pass locally, I'll instead just grab the
line count of the grep output. However, `wc` is padded on macos with
spaces, so we need to get rid of those too.
This commit is contained in:
Ethan
2025-01-15 14:23:53 +11:00
committed by GitHub
parent 53806906ea
commit 2413106f22
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/ssh_test.go
View File

@ -1219,8 +1219,10 @@ func TestSSH(t *testing.T) {
// started and accepting input on stdin.
_ = pty.Peek(ctx, 1)
pty.WriteLine(fmt.Sprintf("netstat -an | grep -q %s; echo \"returned $?\"", remoteSock))
pty.ExpectMatchContext(ctx, "returned 0")
// This needs to support most shells on Linux or macOS
// We can't include exactly what's expected in the input, as that will always be matched
pty.WriteLine(fmt.Sprintf(`echo "results: $(netstat -an | grep %s | wc -l | tr -d ' ')"`, remoteSock))
pty.ExpectMatchContext(ctx, "results: 1")
// And we're done.
pty.WriteLine("exit")