Skip to content

Commit fef323e

Browse files
authored
Refactor error handling in race condition tests to use more expressive statements (#28)
1 parent f2b237a commit fef323e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

pkg/prefetch/race_cond_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,14 @@ func TestPrefetcherGrowingFile(t *testing.T) {
288288

289289
n, err := pf.ReadAt(buffer, offset)
290290

291-
if err == nil {
291+
switch err {
292+
case nil:
292293
successfulReads.Add(1)
293294
offset += int64(n)
294-
} else if err == io.EOF {
295+
case io.EOF:
295296
eofCount.Add(1)
296297
time.Sleep(growDelay * 2)
297-
} else {
298+
default:
298299
t.Errorf("Unexpected error: %v at offset %d (current size: %d)",
299300
err, offset, currentSize)
300301
break
@@ -442,19 +443,20 @@ func TestPrefetcherZeroSizedReadsAndEmptyReader(t *testing.T) {
442443
buf := make([]byte, tc.readSize)
443444
n, err := pf.ReadAt(buf, offset)
444445

445-
if tc.dataSize == 0 && tc.readSize > 0 {
446+
switch {
447+
case tc.dataSize == 0 && tc.readSize > 0:
446448
if err != io.EOF {
447449
t.Errorf("Expected EOF for non-zero read on empty reader, got %v", err)
448450
}
449-
} else if tc.readSize == 0 {
451+
case tc.readSize == 0:
450452
if n != 0 {
451453
t.Errorf("Expected 0 bytes for zero-sized read, got %d", n)
452454
}
453455
if tc.dataSize > 0 && offset < int64(tc.dataSize) && err != nil {
454456
t.Errorf("Expected no error for zero-sized read within bounds, got %v", err)
455457
}
456-
} else if tc.dataSize > 0 && offset >= int64(tc.dataSize) {
457-
if err != io.EOF && err != ErrOffsetOutOfRange {
458+
case tc.dataSize > 0 && offset >= int64(tc.dataSize):
459+
if err != io.EOF && !errors.Is(err, ErrOffsetOutOfRange) {
458460
t.Errorf("Expected EOF or ErrOffsetOutOfRange when reading past end, got %v", err)
459461
}
460462
}

0 commit comments

Comments
 (0)