KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Fix flaky worker cancel test

Browse source
This commit is contained in:
Alexander Neumann 2016-05-09 20:41:55 +02:00
parent deae1e7e29
commit c6d934a685
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/restic/worker/pool_test.go
View file

@ -94,7 +94,6 @@ var errCancelled = errors.New("cancelled")
type Job struct { type Job struct {
suc chan struct{} suc chan struct{}
d time.Duration
} }
func wait(job worker.Job, done <-chan struct{}) (interface{}, error) { func wait(job worker.Job, done <-chan struct{}) (interface{}, error) {
@ -102,8 +101,6 @@ func wait(job worker.Job, done <-chan struct{}) (interface{}, error) {
select { select {
case j.suc <- struct{}{}: case j.suc <- struct{}{}:
return time.Now(), nil return time.Now(), nil
case <-time.After(j.d):
return time.Now(), nil
case <-done: case <-done:
return nil, errCancelled return nil, errCancelled
} }
@ -114,7 +111,7 @@ func TestPoolCancel(t *testing.T) {
suc := make(chan struct{}, 1) suc := make(chan struct{}, 1)
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
jobCh <- worker.Job{Data: Job{suc: suc, d: time.Second}} jobCh <- worker.Job{Data: Job{suc: suc}}
} }
<-suc <-suc