@@ -163,12 +163,12 @@ def test_api_classroom_recording_create_vod_instructor_or_admin(self):
163
163
status = 200 ,
164
164
)
165
165
166
- with (
167
- mock . patch (
168
- "marsha.bbb.api.invoke_lambda_convert"
169
- ) as mock_invoke_lambda_convert ,
170
- mock . patch . object ( timezone , "now" , return_value = now ),
171
- self . assertNumQueries ( 9 ),
166
+ with mock . patch (
167
+ "marsha.bbb.api.invoke_lambda_convert"
168
+ ) as mock_invoke_lambda_convert , mock . patch . object (
169
+ timezone , "now" , return_value = now
170
+ ), self . assertNumQueries (
171
+ 9
172
172
):
173
173
response = self .client .post (
174
174
f"/api/classrooms/{ recording .classroom .id } /recordings/{ recording .id } /create-vod/" ,
@@ -177,7 +177,7 @@ def test_api_classroom_recording_create_vod_instructor_or_admin(self):
177
177
)
178
178
179
179
self .assertEqual (Video .objects .count (), 1 )
180
- self .assertEqual (Video .objects .first ().transcode_pipeline , "peertube " )
180
+ self .assertEqual (Video .objects .first ().transcode_pipeline , "AWS " )
181
181
self .assertEqual (response .status_code , 201 )
182
182
183
183
recording .refresh_from_db ()
@@ -225,10 +225,9 @@ def test_api_classroom_recording_create_vod_instructor_or_admin_unknown_recordin
225
225
226
226
now = timezone .now ()
227
227
228
- with (
229
- mock .patch .object (timezone , "now" , return_value = now ),
230
- self .assertNumQueries (1 ),
231
- ):
228
+ with mock .patch .object (
229
+ timezone , "now" , return_value = now
230
+ ), self .assertNumQueries (1 ):
232
231
response = self .client .post (
233
232
f"/api/classrooms/{ recording .classroom .id } "
234
233
f"/recordings/{ recording .classroom .id } /create-vod/" ,
@@ -332,7 +331,7 @@ def test_api_classroom_recording_create_vod_user_access_token_organization_admin
332
331
333
332
self .assertEqual (response .status_code , 201 )
334
333
self .assertEqual (Video .objects .count (), 1 )
335
- self .assertEqual (Video .objects .first ().transcode_pipeline , "peertube " )
334
+ self .assertEqual (Video .objects .first ().transcode_pipeline , "AWS " )
336
335
337
336
@responses .activate
338
337
def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_site (
@@ -411,7 +410,7 @@ def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_sit
411
410
412
411
self .assertEqual (response .status_code , 201 )
413
412
self .assertEqual (Video .objects .count (), 1 )
414
- self .assertEqual (Video .objects .first ().transcode_pipeline , "peertube " )
413
+ self .assertEqual (Video .objects .first ().transcode_pipeline , "AWS " )
415
414
416
415
def test_api_classroom_recording_create_vod_from_standalone_site_inactive_conversion (
417
416
self ,
@@ -511,7 +510,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_admin(
511
510
512
511
self .assertEqual (response .status_code , 201 )
513
512
self .assertEqual (Video .objects .count (), 1 )
514
- self .assertEqual (Video .objects .first ().transcode_pipeline , "peertube " )
513
+ self .assertEqual (Video .objects .first ().transcode_pipeline , "AWS " )
515
514
516
515
@responses .activate
517
516
def test_api_classroom_recording_create_vod_user_access_token_playlist_instructor (
@@ -585,7 +584,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_instructo
585
584
586
585
self .assertEqual (response .status_code , 201 )
587
586
self .assertEqual (Video .objects .count (), 1 )
588
- self .assertEqual (Video .objects .first ().transcode_pipeline , "peertube " )
587
+ self .assertEqual (Video .objects .first ().transcode_pipeline , "AWS " )
589
588
590
589
def test_api_classroom_recording_create_vod_user_access_token_playlist_student (
591
590
self ,
@@ -667,12 +666,12 @@ def test_api_classroom_recording_create_vod_instructor_or_admin_inactive_convers
667
666
668
667
now = timezone .now ()
669
668
670
- with (
671
- mock . patch (
672
- "marsha.bbb.api.invoke_lambda_convert"
673
- ) as mock_invoke_lambda_convert ,
674
- mock . patch . object ( timezone , "now" , return_value = now ),
675
- self . assertNumQueries ( 1 ),
669
+ with mock . patch (
670
+ "marsha.bbb.api.invoke_lambda_convert"
671
+ ) as mock_invoke_lambda_convert , mock . patch . object (
672
+ timezone , "now" , return_value = now
673
+ ), self . assertNumQueries (
674
+ 1
676
675
):
677
676
response = self .client .post (
678
677
f"/api/classrooms/{ recording .classroom .id } /recordings/{ recording .id } /create-vod/" ,
0 commit comments