octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-31 05:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/watchaggregator: Don't care about timings during testing on darwin

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4502
This commit is contained in:
Simon Frei 2017-11-10 17:05:31 +00:00 committed by Jakob Borg
parent 386cb274bd
commit ec4c3bae0d
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/watchaggregator/aggregator.go
View File

@ -110,7 +110,7 @@ type aggregator struct {
ctx context.Context
}
func new(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator {
func newAggregator(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator {
a := &aggregator{
folderCfgUpdate: make(chan config.FolderConfiguration),
notifyTimerNeedsReset: false,
@ -124,7 +124,7 @@ func new(folderCfg config.FolderConfiguration, ctx context.Context) *aggregator
}
func Aggregate(in <-chan fs.Event, out chan<- []string, folderCfg config.FolderConfiguration, cfg *config.Wrapper, ctx context.Context) {
a := new(folderCfg, ctx)
a := newAggregator(folderCfg, ctx)
// Necessary for unit tests where the backend is mocked
go a.mainLoop(in, out, cfg)

49
lib/watchaggregator/aggregator_test.go
View File

@ -10,6 +10,7 @@ import (
"context"
"os"
"path/filepath"
"runtime"
"strconv"
"testing"
"time"
@ -62,7 +63,7 @@ func TestAggregate(t *testing.T) {
folderCfg := defaultFolderCfg.Copy()
folderCfg.ID = "Aggregate"
ctx, _ := context.WithCancel(context.Background())
a := new(folderCfg, ctx)
a := newAggregator(folderCfg, ctx)
// checks whether maxFilesPerDir events in one dir are kept as is
for i := 0; i < maxFilesPerDir; i++ {
@ -228,54 +229,56 @@ func testScenario(t *testing.T, name string, testCase func(c chan<- fs.Event), e
folderCfg := defaultFolderCfg.Copy()
folderCfg.ID = name
a := new(folderCfg, ctx)
a := newAggregator(folderCfg, ctx)
a.notifyTimeout = testNotifyTimeout
startTime := time.Now()
go a.mainLoop(eventChan, watchChan, defaultCfg)
sleepMs(10)
go testAggregatorOutput(t, watchChan, expectedBatches, startTime, ctx)
sleepMs(20)
testCase(eventChan)
go testCase(eventChan)
testAggregatorOutput(t, watchChan, expectedBatches, startTime)
timeout := time.NewTimer(time.Duration(expectedBatches[len(expectedBatches)-1].beforeMs+100) * time.Millisecond)
<-timeout.C
cancel()
}
func testAggregatorOutput(t *testing.T, fsWatchChan <-chan []string, expectedBatches []expectedBatch, startTime time.Time, ctx context.Context) {
func testAggregatorOutput(t *testing.T, fsWatchChan <-chan []string, expectedBatches []expectedBatch, startTime time.Time) {
var received []string
var elapsedTime time.Duration
batchIndex := 0
timeout := time.NewTimer(10 * time.Second)
for {
select {
case <-ctx.Done():
if batchIndex != len(expectedBatches) {
t.Errorf("Received only %d batches (%d expected)", batchIndex, len(expectedBatches))
}
case <-timeout.C:
t.Errorf("Timeout: Received only %d batches (%d expected)", batchIndex, len(expectedBatches))
return
case received = <-fsWatchChan:
}
if batchIndex >= len(expectedBatches) {
t.Errorf("Received batch %d (only %d expected)", batchIndex+1, len(expectedBatches))
continue
}
elapsedTime = time.Since(startTime)
expected := expectedBatches[batchIndex]
switch {
case elapsedTime < durationMs(expected.afterMs):
t.Errorf("Received batch %d after %v (too soon)", batchIndex+1, elapsedTime)
case elapsedTime > durationMs(expected.beforeMs):
t.Errorf("Received batch %d after %v (too late)", batchIndex+1, elapsedTime)
if runtime.GOOS != "darwin" {
switch {
case elapsedTime < durationMs(expected.afterMs):
t.Errorf("Received batch %d after %v (too soon)", batchIndex+1, elapsedTime)
case len(received) != len(expected.paths):
case elapsedTime > durationMs(expected.beforeMs):
t.Errorf("Received batch %d after %v (too late)", batchIndex+1, elapsedTime)
}
}
if len(received) != len(expected.paths) {
t.Errorf("Received %v events instead of %v for batch %v", len(received), len(expected.paths), batchIndex+1)
}
compareBatchToExpected(t, received, expected.paths)
batchIndex++
if batchIndex == len(expectedBatches) {
// received everything we expected to
return
}
}
}