Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use https://github.com/fortio/log/releases/tag/v1.17.1 #68

Merged
merged 4 commits into from
Oct 2, 2024
Merged

Use https://github.com/fortio/log/releases/tag/v1.17.1 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1dc3a1
Use https://github.com/fortio/log/releases/tag/v1.17.1
ldemailly Oct 2, 2024
6d3ae04
sleep some more... slow mac ci
ldemailly Oct 2, 2024
7664736
moar sleep
ldemailly Oct 2, 2024
7e1899e
no /tmp on windows
ldemailly Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configmap/loglevel_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
t.Fatalf("unable to write %v: %v", binaryFlag, err)
}
// Time based tests aren't great, specially when ran on (slow) CI try to have notification not get events for above.
time.Sleep(1 * time.Second)
time.Sleep(3 * time.Second)
var u *configmap.Updater
log.SetLogLevel(log.Debug)
if u, err = configmap.Setup(flag.CommandLine, pDir); err != nil {
Expand All @@ -76,7 +76,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
t.Fatalf("unable to write %v: %v", fName, err)
}
// Time based tests aren't great, specially when ran on (slow) CI but...
time.Sleep(2 * time.Second)
time.Sleep(5 * time.Second)
newLevel := log.GetLogLevel()
if newLevel != log.Info {
t.Errorf("Loglevel didn't change as expected, still %v %v", newLevel, newLevel.String())
Expand All @@ -89,7 +89,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
if err = os.WriteFile(binaryFlag, []byte{1, 2, 3, 4, 5}, 0o644); err != nil {
t.Fatalf("unable to write %v: %v", binaryFlag, err)
}
time.Sleep(3 * time.Second)
time.Sleep(4 * time.Second)
// We might get more than 1 event for some reasons, so more than 1 error
errCount := u.Errors()
if errCount < 1 {
Expand Down
2 changes: 1 addition & 1 deletion configmap/updater_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type updaterTestSuite struct {

func (s *updaterTestSuite) SetupTest() {
var err error
s.tempDir, err = os.MkdirTemp("/tmp", "updater_test")
s.tempDir, err = os.MkdirTemp("", "updater_test")
assert.NoError(s.T(), err, "failed creating temp directory for testing")
s.copyTestDataToDir()
s.linkDataDirTo(firstGoodDir)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
fortio.org/assert v1.2.1
fortio.org/log v1.16.0
fortio.org/log v1.17.1
fortio.org/sets v1.2.0
github.com/fsnotify/fsnotify v1.7.0
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=
fortio.org/log v1.16.0 h1:GhU8/9NkYZmEIzvTN/DTMedDAStLJraWUUVUA2EbNDc=
fortio.org/log v1.16.0/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
fortio.org/log v1.17.1 h1:YQoGyZBnXTVIs77/nZw7BppwSOIamP3I092PGBenBZs=
fortio.org/log v1.17.1/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
fortio.org/sets v1.2.0 h1:FBfC7R2xrOJtkcioUbY6WqEzdujuBoZRbSdp1fYF4Kk=
fortio.org/sets v1.2.0/go.mod h1:J2BwIxNOLWsSU7IMZUg541kh3Au4JEKHrghVwXs68tE=
fortio.org/struct2env v0.4.1 h1:rJludAMO5eBvpWplWEQNqoVDFZr4RWMQX7RUapgZyc0=
Expand Down
Loading