Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-25 09:18:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #239 from LK4D4/race_test

Browse source 
Fix race in test
This commit is contained in:
Abiola Ibrahim 2015-09-11 16:58:19 +01:00
commit 26dc212f4c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
middleware/markdown/watcher_test.go
View file

@ -3,6 +3,7 @@ package markdown
import ( import (
"fmt" "fmt"
"strings" "strings"
"sync"
"testing" "testing"
"time" "time"
) )
@ -23,12 +24,18 @@ func TestWatcher(t *testing.T) {
} }
out = "" out = ""
i = 0 i = 0
var mu sync.Mutex
stopChan = TickerFunc(interval, func() { stopChan = TickerFunc(interval, func() {
i++ i++
mu.Lock()
out += fmt.Sprint(i) out += fmt.Sprint(i)
mu.Unlock()
}) })
time.Sleep(interval * 10) time.Sleep(interval * 10)
if !strings.HasPrefix(out, expected) || out == expected { mu.Lock()
res := out
mu.Unlock()
if !strings.HasPrefix(res, expected) || res == expected {
t.Fatalf("expected (%v) must be a proper prefix of out(%v).", expected, out) t.Fatalf("expected (%v) must be a proper prefix of out(%v).", expected, out)
} }
} }