Fix flakiness in log rotation test #2213
Conversation
m3co-code
force-pushed
the
fix-flakiness-in-log-rotation-test
branch
from
4f5f0ab
to
0b3ba87
Compare
integration/log_rotation_test.go
Outdated
| @@ -111,6 +120,13 @@ func (s *LogRotationSuite) TestTraefikLogRotation(c *check.C) { | |||
| c.Assert(lineCount, checker.GreaterOrEqualThan, 7) | |||
| } | |||
|
|
|||
| func logAccessLogFile(c *check.C, fileName string) { | |||
| output, err := ioutil.ReadFile(fileName) | |||
| c.Assert(err, checker.IsNil, check.Commentf("error opening access log file %s: %s", fileName, err)) | |||
There was a problem hiding this comment.
AFAIR the error from ioutil.ReadFile will already contain the file name and detailed error message.
There was a problem hiding this comment.
Good point. I removed the Commentf.
integration/log_rotation_test.go
Outdated
| output, err := ioutil.ReadFile(fileName) | ||
| c.Assert(err, checker.IsNil, check.Commentf("error opening access log file %s: %s", fileName, err)) | ||
| c.Logf("Contents of file %s", fileName) | ||
| c.Log(string(output)) |
There was a problem hiding this comment.
Could also be part of the previous statement, separating the message "header" and the content by a newline (\n).
There was a problem hiding this comment.
Simplified it into one line 👍
| @@ -111,6 +120,13 @@ func (s *LogRotationSuite) TestTraefikLogRotation(c *check.C) { | |||
| c.Assert(lineCount, checker.GreaterOrEqualThan, 7) | |||
| } | |||
|
|
|||
| func logAccessLogFile(c *check.C, fileName string) { | |||
| output, err := ioutil.ReadFile(fileName) | |||
There was a problem hiding this comment.
Maybe a case of t.Helper()?
There was a problem hiding this comment.
In the case of the integration tests we can not use it, as we don't have access to testing.T.
ldez
added
area/logs
kind/bug/fix
|
@timoreimann thanks for the review, I incorporated the feedback. I am not sure though why Semaphore won't build this branch.. |
|
I think 3s is too large: FYI we use a multiplier in the CI |
|
I close and reopen due to Semaphore |
- wait up to 3 seconds for the creation of the new log file after sending the signal to rotate the log files - improve logging output in case of failure
traefiker
force-pushed
the
fix-flakiness-in-log-rotation-test
branch
from
5e616b8
to
1f36ff0
Compare
ldez
changed the title
This PR fixes #2203 by waiting up to 3 seconds until the new log file is created after the signal was sent to Traefik to rotate the log files. Also, it improves logging of the log file output in case something is not correct to ease the detection of potential other problems that were hidden before.