Skip to content

Commit 165b8a2

Browse files
authored
* Use https://github.com/fortio/log/releases/tag/v1.17.1 * sleep some more... slow mac ci * moar sleep * no /tmp on windows
1 parent 06cfb7a commit 165b8a2

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

configmap/loglevel_change_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
5555
t.Fatalf("unable to write %v: %v", binaryFlag, err)
5656
}
5757
// Time based tests aren't great, specially when ran on (slow) CI try to have notification not get events for above.
58-
time.Sleep(1 * time.Second)
58+
time.Sleep(3 * time.Second)
5959
var u *configmap.Updater
6060
log.SetLogLevel(log.Debug)
6161
if u, err = configmap.Setup(flag.CommandLine, pDir); err != nil {
@@ -76,7 +76,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
7676
t.Fatalf("unable to write %v: %v", fName, err)
7777
}
7878
// Time based tests aren't great, specially when ran on (slow) CI but...
79-
time.Sleep(2 * time.Second)
79+
time.Sleep(5 * time.Second)
8080
newLevel := log.GetLogLevel()
8181
if newLevel != log.Info {
8282
t.Errorf("Loglevel didn't change as expected, still %v %v", newLevel, newLevel.String())
@@ -89,7 +89,7 @@ func TestDynamicLogLevelAndBinaryFlag(t *testing.T) {
8989
if err = os.WriteFile(binaryFlag, []byte{1, 2, 3, 4, 5}, 0o644); err != nil {
9090
t.Fatalf("unable to write %v: %v", binaryFlag, err)
9191
}
92-
time.Sleep(3 * time.Second)
92+
time.Sleep(4 * time.Second)
9393
// We might get more than 1 event for some reasons, so more than 1 error
9494
errCount := u.Errors()
9595
if errCount < 1 {

configmap/updater_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type updaterTestSuite struct {
3737

3838
func (s *updaterTestSuite) SetupTest() {
3939
var err error
40-
s.tempDir, err = os.MkdirTemp("/tmp", "updater_test")
40+
s.tempDir, err = os.MkdirTemp("", "updater_test")
4141
assert.NoError(s.T(), err, "failed creating temp directory for testing")
4242
s.copyTestDataToDir()
4343
s.linkDataDirTo(firstGoodDir)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
fortio.org/assert v1.2.1
7-
fortio.org/log v1.16.0
7+
fortio.org/log v1.17.1
88
fortio.org/sets v1.2.0
99
github.com/fsnotify/fsnotify v1.7.0
1010
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fortio.org/assert v1.2.1 h1:48I39urpeDj65RP1KguF7akCjILNeu6vICiYMEysR7Q=
22
fortio.org/assert v1.2.1/go.mod h1:039mG+/iYDPO8Ibx8TrNuJCm2T2SuhwRI3uL9nHTTls=
3-
fortio.org/log v1.16.0 h1:GhU8/9NkYZmEIzvTN/DTMedDAStLJraWUUVUA2EbNDc=
4-
fortio.org/log v1.16.0/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
3+
fortio.org/log v1.17.1 h1:YQoGyZBnXTVIs77/nZw7BppwSOIamP3I092PGBenBZs=
4+
fortio.org/log v1.17.1/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
55
fortio.org/sets v1.2.0 h1:FBfC7R2xrOJtkcioUbY6WqEzdujuBoZRbSdp1fYF4Kk=
66
fortio.org/sets v1.2.0/go.mod h1:J2BwIxNOLWsSU7IMZUg541kh3Au4JEKHrghVwXs68tE=
77
fortio.org/struct2env v0.4.1 h1:rJludAMO5eBvpWplWEQNqoVDFZr4RWMQX7RUapgZyc0=

0 commit comments

Comments
 (0)