Skip to content

Commit 97b404e

Browse files
committed
fix: unit test
1 parent e5e2099 commit 97b404e

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

pkg/file/joiner/joiner_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"github.com/ethersphere/bee/pkg/swarm"
3333
"github.com/ethersphere/bee/pkg/util/testutil"
3434
"github.com/ethersphere/bee/pkg/util/testutil/pseudorand"
35-
"github.com/ethersphere/bee/pkg/util/testutil/racedetection"
3635
"gitlab.com/nolash/go-mockbytes"
3736
"golang.org/x/sync/errgroup"
3837
)
@@ -1253,10 +1252,6 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
12531252
canReadRange := func(t *testing.T, s getter.Strategy, fallback bool, levels int, canRead bool) {
12541253
ctx := context.Background()
12551254
strategyTimeout := 100 * time.Millisecond
1256-
decodingTimeout := 600 * time.Millisecond
1257-
if racedetection.IsOn() {
1258-
decodingTimeout *= 2
1259-
}
12601255

12611256
strategyTimeoutStr := strategyTimeout.String()
12621257
decodingTimeoutStr := (2 * strategyTimeout).String()
@@ -1266,8 +1261,6 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
12661261
t.Fatal(err)
12671262
}
12681263

1269-
ctx, cancel := context.WithTimeout(ctx, time.Duration(levels)*(3*strategyTimeout+decodingTimeout))
1270-
defer cancel()
12711264
j, _, err := joiner.New(ctx, store, store, addr)
12721265
if err != nil {
12731266
t.Fatal(err)

pkg/file/redundancy/getter/getter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ func (g *decoder) fetch(ctx context.Context, i int, waitForRecovery bool) (err e
145145
g.wg.Add(1)
146146
defer g.wg.Done()
147147

148-
defer close(g.waits[i])
149-
150148
// retrieval
151149
ch, err := g.fetcher.Get(fctx, g.addrs[i])
152150
if err != nil {
153151
g.failedCnt.Add(1)
152+
close(g.waits[i])
154153
return waitRecovery(err)
155154
}
156155

157156
g.fetchedCnt.Add(1)
158157
g.setData(i, ch.Data())
158+
close(g.waits[i])
159159
return nil
160160
}
161161

0 commit comments

Comments
 (0)