5
5
"sort"
6
6
"strings"
7
7
"testing"
8
+ "time"
8
9
9
10
"github.com/OdyseeTeam/transcoder/library"
10
11
"github.com/OdyseeTeam/transcoder/library/db"
@@ -22,11 +23,11 @@ type managerSuite struct {
22
23
library.LibraryTestHelper
23
24
}
24
25
25
- func isLevel5 (key string ) bool {
26
+ func isLevel5 (_ string ) bool {
26
27
return rand .Intn (2 ) == 0 // #nosec G404
27
28
}
28
29
29
- func isChannelEnabled (key string ) bool {
30
+ func isChannelEnabled (_ string ) bool {
30
31
return rand .Intn (2 ) == 0 // #nosec G404
31
32
}
32
33
@@ -49,7 +50,7 @@ func (s *managerSuite) TestVideo() {
49
50
50
51
_ , err = lib .AddChannel ("@BretWeinstein#f" , db .ChannelPriorityHigh )
51
52
s .Require ().NoError (err )
52
- _ , err = lib .AddChannel ("@davidpakman#7 " , "" )
53
+ _ , err = lib .AddChannel ("@veritasium:f " , "" )
53
54
s .Require ().NoError (err )
54
55
_ , err = lib .AddChannel ("@specialoperationstest#3" , "" )
55
56
s .Require ().NoError (err )
@@ -62,7 +63,7 @@ func (s *managerSuite) TestVideo() {
62
63
"@BretWeinstein#f/EvoLens87#1" ,
63
64
}
64
65
urlsEnabled := []string {
65
- "@davidpakman#7/vaccination-delays-and-more-biden-picks#8 " ,
66
+ "@veritasium#f/on-these-questions,-smarter-people-do#e " ,
66
67
"@specialoperationstest#3/fear-of-death-inspirational#a" ,
67
68
}
68
69
urlsLevel5 := []string {
@@ -85,37 +86,37 @@ func (s *managerSuite) TestVideo() {
85
86
for _ , u := range urlsPriority {
86
87
v , err := mgr .Video (u )
87
88
s .Empty (v )
88
- s .Equal (resolve .ErrTranscodingQueued , err )
89
+ s .Equal (resolve .ErrTranscodingQueued , err , u )
89
90
}
90
91
91
92
for _ , u := range urlsEnabled {
92
93
v , err := mgr .Video (u )
93
94
s .Empty (v )
94
- s .Equal (resolve .ErrTranscodingQueued , err )
95
+ s .Equal (resolve .ErrTranscodingQueued , err , u )
95
96
}
96
97
97
98
for _ , u := range urlsLevel5 {
98
99
v , err := mgr .Video (u )
99
100
s .Empty (v )
100
- s .Equal (resolve .ErrTranscodingQueued , err )
101
+ s .Equal (resolve .ErrTranscodingQueued , err , u )
101
102
}
102
103
103
104
for _ , u := range urlsNotEnabled {
104
105
v , err := mgr .Video (u )
105
106
s .Empty (v )
106
- s .Equal (resolve .ErrTranscodingForbidden , err )
107
+ s .Equal (resolve .ErrTranscodingForbidden , err , u )
107
108
}
108
109
109
110
for _ , u := range urlsDisabled {
110
111
v , err := mgr .Video (u )
111
112
s .Empty (v )
112
- s .Equal (resolve .ErrTranscodingForbidden , err )
113
+ s .Equal (resolve .ErrTranscodingForbidden , err , u )
113
114
}
114
115
115
116
for _ , u := range urlsNoChannel {
116
117
v , err := mgr .Video (u )
117
118
s .Empty (v )
118
- s .Equal (resolve .ErrNoSigningChannel , err )
119
+ s .Equal (resolve .ErrNoSigningChannel , err , u )
119
120
}
120
121
121
122
for _ , u := range urlsNotFound {
@@ -125,14 +126,22 @@ func (s *managerSuite) TestVideo() {
125
126
}
126
127
127
128
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
+ }
134
141
}
135
- }
142
+ return urls
143
+ }()
144
+
136
145
sort .Strings (expectedUrls )
137
146
sort .Strings (receivedUrls )
138
147
s .Equal (expectedUrls , receivedUrls )
0 commit comments