aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/pull_test.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/models/pull_test.go b/models/pull_test.go
index c8eb033aa5..e725193bb1 100644
--- a/models/pull_test.go
+++ b/models/pull_test.go
@@ -5,6 +5,7 @@
package models
import (
+ "strconv"
"testing"
"time"
@@ -193,8 +194,12 @@ func TestPullRequest_AddToTaskQueue(t *testing.T) {
pr := AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)
pr.AddToTaskQueue()
- // briefly sleep so that background threads have time to run
- time.Sleep(time.Millisecond)
+ select {
+ case id := <-pullRequestQueue.Queue():
+ assert.EqualValues(t, strconv.FormatInt(pr.ID, 10), id)
+ case <-time.After(time.Second):
+ assert.Fail(t, "Timeout: nothing was added to pullRequestQueue")
+ }
assert.True(t, pullRequestQueue.Exist(pr.ID))
pr = AssertExistsAndLoadBean(t, &PullRequest{ID: 1}).(*PullRequest)