Skip to content

Commit 277f0db

Browse files
committed
update file closing logic
1 parent d5a1a1b commit 277f0db

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

tests/suite/scale_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"bytes"
55
"context"
6+
"errors"
67
"fmt"
78
"io"
89
"os"
@@ -844,12 +845,9 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
844845
_, err := fmt.Fprint(outFile)
845846
Expect(err).ToNot(HaveOccurred())
846847

847-
// check if file is already closed or not
848848
if outFile != nil {
849-
err = outFile.Close()
850-
if err != nil {
851-
// warning only
852-
if strings.Contains(err.Error(), "file already closed") {
849+
if err := outFile.Close(); err != nil {
850+
if errors.Is(err, os.ErrClosed) || strings.Contains(err.Error(), "file already closed") {
853851
GinkgoWriter.Printf("Warning: attempted to close already closed file: %v\n", err)
854852
} else {
855853
Expect(err).ToNot(HaveOccurred())
@@ -1048,7 +1046,7 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
10481046
return nil
10491047
},
10501048
).
1051-
WithTimeout(timeoutConfig.RequestTimeout).
1049+
WithTimeout(timeoutConfig.GetStatusTimeout).
10521050
WithPolling(1 * time.Second).
10531051
Should(Succeed())
10541052
}

0 commit comments

Comments
 (0)