github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(adminmonitor): fix a data race in a unit test EE-2714 (#6627)

pull/6658/head
andres-portainer 2022-03-15 09:52:41 -03:00 committed by GitHub
parent 9a42d4c506
commit 78f7cd0d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/adminmonitor/admin_monitor_test.go
View File

@ -35,9 +35,15 @@ func Test_start_shouldFatalAfterTimeout_ifNotInitialized(t *testing.T) {
datastore := i.NewDatastore(i.WithUsers([]portainer.User{})) datastore := i.NewDatastore(i.WithUsers([]portainer.User{}))
ch := make(chan struct{})
var fataled bool var fataled bool
origLogFatalf := logFatalf origLogFatalf := logFatalf
logFatalf = func(s string, v ...interface{}) { fataled = true }
logFatalf = func(s string, v ...interface{}) {
fataled = true
close(ch)
}
defer func() { defer func() {
logFatalf = origLogFatalf logFatalf = origLogFatalf
}() }()
@ -45,6 +51,7 @@ func Test_start_shouldFatalAfterTimeout_ifNotInitialized(t *testing.T) {
monitor := New(timeout, datastore, context.Background()) monitor := New(timeout, datastore, context.Background())
monitor.Start() monitor.Start()
<-time.After(2 * timeout) <-time.After(2 * timeout)
<-ch
assert.True(t, fataled, "monitor should been timeout and fatal") assert.True(t, fataled, "monitor should been timeout and fatal")
} }