Skip to content

Commit 150aa85

Browse files
committed
Fix failing queue test
1 parent f9740f1 commit 150aa85

File tree

1 file changed

+26
-17
lines changed

1 file changed

+26
-17
lines changed

manager/manager_test.go

+26-17
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"sort"
66
"strings"
77
"testing"
8+
"time"
89

910
"github.com/OdyseeTeam/transcoder/library"
1011
"github.com/OdyseeTeam/transcoder/library/db"
@@ -22,11 +23,11 @@ type managerSuite struct {
2223
library.LibraryTestHelper
2324
}
2425

25-
func isLevel5(key string) bool {
26+
func isLevel5(_ string) bool {
2627
return rand.Intn(2) == 0 // #nosec G404
2728
}
2829

29-
func isChannelEnabled(key string) bool {
30+
func isChannelEnabled(_ string) bool {
3031
return rand.Intn(2) == 0 // #nosec G404
3132
}
3233

@@ -49,7 +50,7 @@ func (s *managerSuite) TestVideo() {
4950

5051
_, err = lib.AddChannel("@BretWeinstein#f", db.ChannelPriorityHigh)
5152
s.Require().NoError(err)
52-
_, err = lib.AddChannel("@davidpakman#7", "")
53+
_, err = lib.AddChannel("@veritasium:f", "")
5354
s.Require().NoError(err)
5455
_, err = lib.AddChannel("@specialoperationstest#3", "")
5556
s.Require().NoError(err)
@@ -62,7 +63,7 @@ func (s *managerSuite) TestVideo() {
6263
"@BretWeinstein#f/EvoLens87#1",
6364
}
6465
urlsEnabled := []string{
65-
"@davidpakman#7/vaccination-delays-and-more-biden-picks#8",
66+
"@veritasium#f/on-these-questions,-smarter-people-do#e",
6667
"@specialoperationstest#3/fear-of-death-inspirational#a",
6768
}
6869
urlsLevel5 := []string{
@@ -85,37 +86,37 @@ func (s *managerSuite) TestVideo() {
8586
for _, u := range urlsPriority {
8687
v, err := mgr.Video(u)
8788
s.Empty(v)
88-
s.Equal(resolve.ErrTranscodingQueued, err)
89+
s.Equal(resolve.ErrTranscodingQueued, err, u)
8990
}
9091

9192
for _, u := range urlsEnabled {
9293
v, err := mgr.Video(u)
9394
s.Empty(v)
94-
s.Equal(resolve.ErrTranscodingQueued, err)
95+
s.Equal(resolve.ErrTranscodingQueued, err, u)
9596
}
9697

9798
for _, u := range urlsLevel5 {
9899
v, err := mgr.Video(u)
99100
s.Empty(v)
100-
s.Equal(resolve.ErrTranscodingQueued, err)
101+
s.Equal(resolve.ErrTranscodingQueued, err, u)
101102
}
102103

103104
for _, u := range urlsNotEnabled {
104105
v, err := mgr.Video(u)
105106
s.Empty(v)
106-
s.Equal(resolve.ErrTranscodingForbidden, err)
107+
s.Equal(resolve.ErrTranscodingForbidden, err, u)
107108
}
108109

109110
for _, u := range urlsDisabled {
110111
v, err := mgr.Video(u)
111112
s.Empty(v)
112-
s.Equal(resolve.ErrTranscodingForbidden, err)
113+
s.Equal(resolve.ErrTranscodingForbidden, err, u)
113114
}
114115

115116
for _, u := range urlsNoChannel {
116117
v, err := mgr.Video(u)
117118
s.Empty(v)
118-
s.Equal(resolve.ErrNoSigningChannel, err)
119+
s.Equal(resolve.ErrNoSigningChannel, err, u)
119120
}
120121

121122
for _, u := range urlsNotFound {
@@ -125,14 +126,22 @@ func (s *managerSuite) TestVideo() {
125126
}
126127

127128
expectedUrls := []string{urlsPriority[0], urlsEnabled[0], urlsLevel5[0], urlsNotEnabled[0], urlsEnabled[1]}
128-
receivedUrls := []string{}
129-
for r := range mgr.Requests() {
130-
receivedUrls = append(receivedUrls, strings.TrimPrefix(r.URI, "lbry://"))
131-
if len(receivedUrls) == len(expectedUrls) {
132-
mgr.pool.Stop()
133-
break
129+
receivedUrls := func() []string {
130+
requestsChan := mgr.Requests()
131+
timeout := time.After(15 * time.Second)
132+
defer mgr.pool.Stop()
133+
urls := []string{}
134+
for len(urls) <= 5 {
135+
select {
136+
case r := <-requestsChan:
137+
urls = append(urls, strings.TrimPrefix(r.URI, "lbry://"))
138+
case <-timeout:
139+
return urls
140+
}
134141
}
135-
}
142+
return urls
143+
}()
144+
136145
sort.Strings(expectedUrls)
137146
sort.Strings(receivedUrls)
138147
s.Equal(expectedUrls, receivedUrls)

0 commit comments

Comments
 (0)