Merge remote-tracking branch 'origin/master' into autotls-v2

martinconic · martinconic · commit 69ff904f7e9b · 2025-11-25T14:23:12.000+02:00
diff --git a/pkg/file/joiner/joiner_test.go b/pkg/file/joiner/joiner_test.go
@@ -1357,6 +1357,9 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {
 						continue
 					}
 					t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d full", encrypt, levels, chunkCnt), func(t *testing.T) {
+						if r2level[rLevel] != levels || encrypt != encryptChunk[rLevel] {
+							t.Skip("skipping to save time")
+						}
 						test(t, rLevel, encrypt, chunkCnt)
 					})
 				}

Original file line number	Diff line number	Diff line change
`@@ -1357,6 +1357,9 @@ func TestJoinerRedundancyMultilevel(t *testing.T) {`
`1357`	`1357`	`continue`
`1358`	`1358`	`}`
`1359`	`1359`	`t.Run(fmt.Sprintf("encrypt=%v levels=%d chunks=%d full", encrypt, levels, chunkCnt), func(t *testing.T) {`
	`1360`	`+ if r2level[rLevel] != levels \|\| encrypt != encryptChunk[rLevel] {`
	`1361`	`+ t.Skip("skipping to save time")`
	`1362`	`+ }`
`1360`	`1363`	`test(t, rLevel, encrypt, chunkCnt)`
`1361`	`1364`	`})`
`1362`	`1365`	`}`