Commit ed797dd
committed
sql/logictest: skip remainder of test on snappy infra flake
When the cockroach-go/testserver-based logic tests hit the known
"Can't find decompressor for snappy" infra flake (#124966) during a
mixed-version test, handleWaitForInitErr stops the testserver cluster
and skips the current subtest. However, only the *current* subtest is
skipped; the parent test loop continues and the next subtest (e.g.
post_upgrade) calls into the dead testserver cluster, failing with
"os: process already finished" so that the overall test reports FAIL
instead of SKIP.
Add a sticky skippedDueToSnappy flag to logicTest, set it alongside
the existing ts.Stop() in handleWaitForInitErr, and check it in the
processTestFile subtest loop to break out and mark the parent test
skipped (preserving real failures with a !rootT.Failed() guard). Also
nil out testserverCluster so any stray code path trips the existing
nil guard cleanly.
Resolves: #168412
Epic: none
Release note: None1 parent f7c6490 commit ed797dd
1 file changed
Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1101 | 1101 | | |
1102 | 1102 | | |
1103 | 1103 | | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
1104 | 1111 | | |
1105 | 1112 | | |
1106 | 1113 | | |
| |||
1438 | 1445 | | |
1439 | 1446 | | |
1440 | 1447 | | |
| 1448 | + | |
| 1449 | + | |
1441 | 1450 | | |
1442 | 1451 | | |
1443 | 1452 | | |
| |||
2313 | 2322 | | |
2314 | 2323 | | |
2315 | 2324 | | |
| 2325 | + | |
| 2326 | + | |
| 2327 | + | |
2316 | 2328 | | |
2317 | 2329 | | |
2318 | 2330 | | |
| |||
2333 | 2345 | | |
2334 | 2346 | | |
2335 | 2347 | | |
| 2348 | + | |
| 2349 | + | |
| 2350 | + | |
| 2351 | + | |
2336 | 2352 | | |
2337 | 2353 | | |
2338 | 2354 | | |
| |||
0 commit comments