fix: run subtests in parallel

ethersphere · Jan 12, 2024 · f60929a · f60929a
1 parent 0624ea4
commit f60929a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/api/bzz_test.go b/pkg/api/bzz_test.go
@@ -68,6 +68,7 @@ func TestBzzUploadDownloadWithRedundancy(t *testing.T) {
 	fileDownloadResource := func(addr string) string { return "/bzz/" + addr + "/" }
 
 	testRedundancy := func(t *testing.T, rLevel redundancy.Level, encrypt bool, levels int, chunkCnt int, shardCnt int, parityCnt int) {
+		t.Helper()
 		seed, err := pseudorand.NewSeed()
 		if err != nil {
 			t.Fatal(err)
@@ -197,6 +198,7 @@ func TestBzzUploadDownloadWithRedundancy(t *testing.T) {
 		})
 	}
 	for _, rLevel := range []redundancy.Level{1, 2, 3, 4} {
+		rLevel := rLevel
 		t.Run(fmt.Sprintf("level=%d", rLevel), func(t *testing.T) {
 			for _, encrypt := range []bool{false, true} {
 				encrypt := encrypt
@@ -216,17 +218,18 @@ func TestBzzUploadDownloadWithRedundancy(t *testing.T) {
 					case 3:
 						chunkCnt = shardCnt*shardCnt + 1
 					}
+					levels := levels
 					t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d", encrypt, levels, chunkCnt), func(t *testing.T) {
 						if levels > 2 && (encrypt == (rLevel%2 == 1)) {
 							t.Skip("skipping to save time")
 						}
+						t.Parallel()
 						testRedundancy(t, rLevel, encrypt, levels, chunkCnt, shardCnt, parityCnt)
 					})
 				}
 			}
 		})
 	}
-
 }
 
 func TestBzzFiles(t *testing.T) {

diff --git a/pkg/file/joiner/joiner_test.go b/pkg/file/joiner/joiner_test.go
@@ -1128,10 +1128,11 @@ func TestJoinerRedundancy(t *testing.T) {
 				}
 				i := 0
 				eg, ectx := errgroup.WithContext(ctx)
+			scnt:
 				for ; i < shardCnt; i++ {
 					select {
 					case <-ectx.Done():
-						break
+						break scnt
 					default:
 					}
 					i := i
@@ -1226,6 +1227,7 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
 	getter.StrategyTimeout = 100 * time.Millisecond
 
 	test := func(t *testing.T, rLevel redundancy.Level, encrypt bool, size int) {
+		t.Helper()
 		store := mockstorer.NewForgettingStore(inmemchunkstore.New())
 		testutil.CleanupCloser(t, store)
 		seed, err := pseudorand.NewSeed()
@@ -1350,6 +1352,7 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
 						continue
 					}
 					t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d full", encrypt, levels, chunkCnt), func(t *testing.T) {
+						t.Parallel()
 						test(t, rLevel, encrypt, chunkCnt)
 					})
 				}