Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit0026a12

Browse files
committed
Use sync.WaitGroup instead of channel
1 parent80dddd2 commit0026a12

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

‎cli/server_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"os"
1818
"runtime"
1919
"strings"
20+
"sync"
2021
"testing"
2122
"time"
2223

@@ -81,9 +82,10 @@ func TestServer(t *testing.T) {
8182
root,cfg:=clitest.New(t,"server","--dev","--skip-tunnel","--address",":0")
8283
varbuf strings.Builder
8384
root.SetOutput(&buf)
84-
done:=make(chanstruct{})
85+
varwg sync.WaitGroup
86+
wg.Add(1)
8587
gofunc() {
86-
deferclose(done)
88+
deferwg.Done()
8789

8890
err:=root.ExecuteContext(ctx)
8991
require.ErrorIs(t,err,context.Canceled)
@@ -116,7 +118,7 @@ func TestServer(t *testing.T) {
116118
require.NoError(t,err)
117119

118120
cancelFunc()
119-
<-done
121+
wg.Wait()
120122
})
121123
// Duplicated test from "Development" above to test setting email/password via env.
122124
// Cannot run parallel due to os.Setenv.
@@ -133,9 +135,10 @@ func TestServer(t *testing.T) {
133135
root,cfg:=clitest.New(t,"server","--dev","--skip-tunnel","--address",":0")
134136
varbuf strings.Builder
135137
root.SetOutput(&buf)
136-
done:=make(chanstruct{})
138+
varwg sync.WaitGroup
139+
wg.Add(1)
137140
gofunc() {
138-
deferclose(done)
141+
deferwg.Done()
139142

140143
err:=root.ExecuteContext(ctx)
141144
require.ErrorIs(t,err,context.Canceled)
@@ -161,7 +164,7 @@ func TestServer(t *testing.T) {
161164
require.NoError(t,err)
162165

163166
cancelFunc()
164-
<-done
167+
wg.Wait()
165168
})
166169
t.Run("TLSBadVersion",func(t*testing.T) {
167170
t.Parallel()

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp