Skip to content

Commit 8cd9a46

Browse files
committed
update mod
1 parent 13e40d1 commit 8cd9a46

File tree

3 files changed

+19
-42
lines changed

3 files changed

+19
-42
lines changed

errgroup_test.go

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package errgroup
33
import (
44
"context"
55
"errors"
6+
"log"
67
"sync/atomic"
78
"testing"
89
"time"
9-
10-
"github.com/go-pay/xlog"
1110
)
1211

1312
func TestErrgroup(t *testing.T) {
@@ -34,14 +33,13 @@ func TestErrgroup(t *testing.T) {
3433
if err := eg.Wait(); err != nil {
3534
// do some thing
3635
count = countBackup
37-
xlog.Error(err)
36+
log.Println(err)
3837
//return
3938
}
40-
xlog.Debug(count)
39+
log.Println(count)
4140
}
4241

4342
func TestErrgroupLimit1(t *testing.T) {
44-
xlog.Level = xlog.DebugLevel
4543
var (
4644
eg Group
4745
goNum = 3 // every times run goNum goroutine
@@ -50,25 +48,24 @@ func TestErrgroupLimit1(t *testing.T) {
5048
var count = int64(i)
5149
eg.Go(func(ctx context.Context) error {
5250
atomic.AddInt64(&count, 1)
53-
xlog.Debug("count:", count)
51+
log.Println("count:", count)
5452
return nil
5553
})
5654
if eg.WorkNum() == goNum {
5755
if err := eg.Wait(); err != nil {
58-
xlog.Error("err1:", err)
56+
log.Println("err1:", err)
5957
// to do something you need
6058
}
61-
xlog.Info("wait")
59+
log.Println("wait")
6260
time.Sleep(time.Second)
6361
}
6462
}
6563
if err := eg.Wait(); err != nil {
66-
xlog.Error("err2:", err)
64+
log.Println("err2:", err)
6765
}
6866
}
6967

7068
func TestErrgroupLimit2(t *testing.T) {
71-
xlog.Level = xlog.DebugLevel
7269
var (
7370
eg Group
7471
)
@@ -77,13 +74,13 @@ func TestErrgroupLimit2(t *testing.T) {
7774
var count = int64(i)
7875
eg.Go(func(ctx context.Context) error {
7976
atomic.AddInt64(&count, 1)
80-
xlog.Debug("count:", count)
77+
log.Println("count:", count)
8178
time.Sleep(time.Second * 3)
8279
return nil
8380
})
8481
}
8582
if err := eg.Wait(); err != nil {
86-
xlog.Error("err2:", err)
83+
log.Println("err2:", err)
8784
}
8885
}
8986

@@ -95,9 +92,9 @@ func timeSleep1(c context.Context) error {
9592
}()
9693
select {
9794
case <-c.Done():
98-
xlog.Infof("timeSleep1 cancel")
95+
log.Println("timeSleep1 cancel")
9996
case rsp := <-data:
100-
xlog.Info(rsp)
97+
log.Println(rsp)
10198
}
10299
return nil
103100
}
@@ -115,9 +112,9 @@ func timeTimeoutSleep3(c context.Context) error {
115112
}()
116113
select {
117114
case <-c.Done():
118-
xlog.Infof("timeSleep3 timeout")
115+
log.Println("timeSleep3 timeout")
119116
case rsp := <-data:
120-
xlog.Info(rsp)
117+
log.Println(rsp)
121118
}
122119
return nil
123120
}
@@ -130,9 +127,9 @@ func timeCancelSleep5(c context.Context) error {
130127
}()
131128
select {
132129
case <-c.Done():
133-
xlog.Infof("timeCancelSleep5 cancel")
130+
log.Println("timeCancelSleep5 cancel")
134131
case rsp := <-data:
135-
xlog.Info(rsp)
132+
log.Println(rsp)
136133
}
137134
return nil
138135
}
@@ -147,13 +144,12 @@ func timeTimeoutSleep5(c context.Context) error {
147144
case <-c.Done():
148145
return errors.New("timeTimeoutSleep5 timeout")
149146
case rsp := <-data:
150-
xlog.Info(rsp)
147+
log.Println(rsp)
151148
}
152149
return nil
153150
}
154151

155152
func TestErrgroupWithCancel(t *testing.T) {
156-
xlog.Level = xlog.DebugLevel
157153
var (
158154
eg = WithCancel(context.Background())
159155
)
@@ -163,14 +159,14 @@ func TestErrgroupWithCancel(t *testing.T) {
163159
})
164160
eg.Go(func(ctx context.Context) error {
165161
if err := timeErrSleep3(ctx); err != nil {
166-
xlog.Error(err)
162+
log.Println(err)
167163
return err
168164
}
169165
return nil
170166
})
171167
eg.Go(func(ctx context.Context) error {
172168
if err := timeCancelSleep5(ctx); err != nil {
173-
xlog.Errorf("err:%v", err)
169+
log.Printf("err:%v", err)
174170
return err
175171
}
176172
return nil
@@ -181,7 +177,6 @@ func TestErrgroupWithCancel(t *testing.T) {
181177
}
182178

183179
func TestErrgroupWithTimeout(t *testing.T) {
184-
xlog.Level = xlog.DebugLevel
185180
var (
186181
eg = WithTimeout(context.Background(), time.Second*4)
187182
)
@@ -195,7 +190,7 @@ func TestErrgroupWithTimeout(t *testing.T) {
195190
})
196191
eg.Go(func(ctx context.Context) error {
197192
if err := timeTimeoutSleep5(ctx); err != nil {
198-
xlog.Errorf("err:%v", err)
193+
log.Printf("err:%v", err)
199194
return err
200195
}
201196
return nil

go.mod

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
module github.com/go-pay/errgroup
22

33
go 1.20
4-
5-
require github.com/go-pay/xlog v0.0.1
6-
7-
require (
8-
go.uber.org/multierr v1.11.0 // indirect
9-
go.uber.org/zap v1.26.0 // indirect
10-
)

go.sum

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +0,0 @@
1-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2-
github.com/go-pay/xlog v0.0.1 h1:hbOHN+Rn6pH83JQzk6904fL7fsHsr9iKCZoBVX+tF9Y=
3-
github.com/go-pay/xlog v0.0.1/go.mod h1:RgjidhvsA+4Qwpk9wN8U9zb/R3Wq+HtaAO0xUXdmSdo=
4-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
5-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
6-
go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
7-
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
8-
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
9-
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
10-
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
11-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

0 commit comments

Comments
 (0)