Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-video-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-video-pipeline
Commits
65639237
Commit
65639237
authored
Sep 12, 2017
by
Qubad786
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename 3PLayMedia to 3PlayMedia
parent
7d9e88af
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
control/tests/test_deliver_3play.py
+5
-5
control/veda_deliver.py
+2
-2
control/veda_deliver_3play.py
+1
-1
No files found.
control/tests/test_deliver_3play.py
View file @
65639237
...
@@ -10,7 +10,7 @@ from mock import patch
...
@@ -10,7 +10,7 @@ from mock import patch
from
django.test
import
TestCase
from
django.test
import
TestCase
from
control.veda_deliver_3play
import
(
from
control.veda_deliver_3play
import
(
ThreeP
L
ayMediaClient
,
ThreeP
l
ayMediaClient
,
ThreePlayMediaUrlError
,
ThreePlayMediaUrlError
,
ThreePlayMediaPerformTranscriptionError
,
ThreePlayMediaPerformTranscriptionError
,
)
)
...
@@ -75,7 +75,7 @@ class ThreePlayMediaClientTests(TestCase):
...
@@ -75,7 +75,7 @@ class ThreePlayMediaClientTests(TestCase):
"""
"""
Verify 3PlayMedia happy transcription flow
Verify 3PlayMedia happy transcription flow
"""
"""
three_play_client
=
ThreeP
L
ayMediaClient
(
**
self
.
video_transcript_preferences
)
three_play_client
=
ThreeP
l
ayMediaClient
(
**
self
.
video_transcript_preferences
)
responses
.
add
(
responses
.
add
(
responses
.
HEAD
,
responses
.
HEAD
,
...
@@ -145,7 +145,7 @@ class ThreePlayMediaClientTests(TestCase):
...
@@ -145,7 +145,7 @@ class ThreePlayMediaClientTests(TestCase):
Tests media url validations.
Tests media url validations.
"""
"""
responses
.
add
(
responses
.
HEAD
,
u'https://s3.amazonaws.com/bkt/video.mp4'
,
**
response
)
responses
.
add
(
responses
.
HEAD
,
u'https://s3.amazonaws.com/bkt/video.mp4'
,
**
response
)
three_play_client
=
ThreeP
L
ayMediaClient
(
**
self
.
video_transcript_preferences
)
three_play_client
=
ThreeP
l
ayMediaClient
(
**
self
.
video_transcript_preferences
)
with
self
.
assertRaises
(
ThreePlayMediaUrlError
):
with
self
.
assertRaises
(
ThreePlayMediaUrlError
):
three_play_client
.
validate_media_url
()
three_play_client
.
validate_media_url
()
...
@@ -172,7 +172,7 @@ class ThreePlayMediaClientTests(TestCase):
...
@@ -172,7 +172,7 @@ class ThreePlayMediaClientTests(TestCase):
)
)
responses
.
add
(
responses
.
POST
,
u'https://api.3playmedia.com/files'
,
**
response
)
responses
.
add
(
responses
.
POST
,
u'https://api.3playmedia.com/files'
,
**
response
)
three_play_client
=
ThreeP
L
ayMediaClient
(
**
self
.
video_transcript_preferences
)
three_play_client
=
ThreeP
l
ayMediaClient
(
**
self
.
video_transcript_preferences
)
with
self
.
assertRaises
(
ThreePlayMediaPerformTranscriptionError
):
with
self
.
assertRaises
(
ThreePlayMediaPerformTranscriptionError
):
three_play_client
.
submit_media
()
three_play_client
.
submit_media
()
...
@@ -207,7 +207,7 @@ class ThreePlayMediaClientTests(TestCase):
...
@@ -207,7 +207,7 @@ class ThreePlayMediaClientTests(TestCase):
"""
"""
responses
.
add
(
responses
.
HEAD
,
u'https://s3.amazonaws.com/bkt/video.mp4'
,
**
first_response
)
responses
.
add
(
responses
.
HEAD
,
u'https://s3.amazonaws.com/bkt/video.mp4'
,
**
first_response
)
responses
.
add
(
responses
.
POST
,
u'https://api.3playmedia.com/files'
,
**
second_response
)
responses
.
add
(
responses
.
POST
,
u'https://api.3playmedia.com/files'
,
**
second_response
)
three_play_client
=
ThreeP
L
ayMediaClient
(
**
self
.
video_transcript_preferences
)
three_play_client
=
ThreeP
l
ayMediaClient
(
**
self
.
video_transcript_preferences
)
three_play_client
.
generate_transcripts
()
three_play_client
.
generate_transcripts
()
self
.
assertFalse
(
mock_log
.
info
.
called
)
self
.
assertFalse
(
mock_log
.
info
.
called
)
...
...
control/veda_deliver.py
View file @
65639237
...
@@ -13,7 +13,7 @@ from boto.s3.key import Key
...
@@ -13,7 +13,7 @@ from boto.s3.key import Key
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
import
veda_deliver_xuetang
import
veda_deliver_xuetang
from
control.veda_deliver_3play
import
ThreeP
L
ayMediaClient
from
control.veda_deliver_3play
import
ThreeP
l
ayMediaClient
from
control_env
import
*
from
control_env
import
*
from
veda_deliver_cielo
import
Cielo24Transcript
from
veda_deliver_cielo
import
Cielo24Transcript
from
veda_deliver_youtube
import
DeliverYoutube
from
veda_deliver_youtube
import
DeliverYoutube
...
@@ -601,7 +601,7 @@ class VedaDelivery:
...
@@ -601,7 +601,7 @@ class VedaDelivery:
org
=
org
,
org
=
org
,
edx_video_id
=
self
.
video_query
.
studio_id
,
edx_video_id
=
self
.
video_query
.
studio_id
,
)
)
three_play_media
=
ThreeP
L
ayMediaClient
(
three_play_media
=
ThreeP
l
ayMediaClient
(
org
=
org
,
org
=
org
,
video
=
self
.
video_query
,
video
=
self
.
video_query
,
media_url
=
s3_video_url
,
media_url
=
s3_video_url
,
...
...
control/veda_deliver_3play.py
View file @
65639237
...
@@ -43,7 +43,7 @@ class ThreePlayMediaUrlError(ThreePlayMediaError):
...
@@ -43,7 +43,7 @@ class ThreePlayMediaUrlError(ThreePlayMediaError):
pass
pass
class
ThreeP
L
ayMediaClient
(
object
):
class
ThreeP
l
ayMediaClient
(
object
):
def
__init__
(
self
,
org
,
video
,
media_url
,
api_key
,
api_secret
,
callback_url
,
turnaround_level
):
def
__init__
(
self
,
org
,
video
,
media_url
,
api_key
,
api_secret
,
callback_url
,
turnaround_level
):
"""
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment