Add Timed Transcripts Editor.

lms/djangoapps/courseware/features/youtube_setup.py

@@ -1,7 +1,6 @@
 #pylint: disable=C0111
 #pylint: disable=W0621
-
-from courseware.mock_youtube_server.mock_youtube_server import MockYoutubeServer
+from xmodule.util.mock_youtube_server.mock_youtube_server import MockYoutubeServer
 from lettuce import before, after, world
 from django.conf import settings
 import threading
@@ -25,6 +24,8 @@ def setup_mock_youtube_server():
 
     server.time_to_response = 1  # seconds
 
+    server.address = address
+
     # Start the server running in a separate daemon thread
     # Because the thread is a daemon, it will terminate
     # when the main thread terminates.

lms/djangoapps/courseware/mock_youtube_server/mock_youtube_server.py

@@ -1,80 +0,0 @@
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-import urlparse
-import mock
-import threading
-import json
-from logging import getLogger
-logger = getLogger(__name__)
-import time
-
-class MockYoutubeRequestHandler(BaseHTTPRequestHandler):
-    '''
-    A handler for Youtube GET requests.
-    '''
-
-    protocol = "HTTP/1.0"
-
-    def do_HEAD(self):
-        self._send_head()
-
-    def do_GET(self):
-        '''
-        Handle a GET request from the client and sends response back.
-        '''
-        self._send_head()
-
-        logger.debug("Youtube provider received GET request to path {}".format(
-            self.path)
-        )  # Log the request
-
-        status_message = "I'm youtube."
-        response_timeout = float(self.server.time_to_response)
-
-        # threading timer produces TypeError: 'NoneType' object is not callable here
-        # so we use time.sleep, as we already in separate thread.
-        time.sleep(response_timeout)
-        self._send_response(status_message)
-
-    def _send_head(self):
-        '''
-        Send the response code and MIME headers
-        '''
-        self.send_response(200)
-        self.send_header('Content-type', 'text/html')
-        self.end_headers()
-
-    def _send_response(self, message):
-        '''
-        Send message back to the client
-        '''
-        callback = urlparse.parse_qs(self.path)['callback'][0]
-        response = callback + '({})'.format(json.dumps({'message': message}))
-        # Log the response
-        logger.debug("Youtube: sent response {}".format(message))
-
-        self.wfile.write(response)
-
-
-class MockYoutubeServer(HTTPServer):
-    '''
-    A mock Youtube provider server that responds
-    to GET requests to localhost.
-    '''
-
-    def __init__(self, address):
-        '''
-        Initialize the mock XQueue server instance.
-
-        *address* is the (host, host's port to listen to) tuple.
-        '''
-        handler = MockYoutubeRequestHandler
-        HTTPServer.__init__(self, address, handler)
-
-    def shutdown(self):
-        '''
-        Stop the server and free up the port
-        '''
-        # First call superclass shutdown()
-        HTTPServer.shutdown(self)
-        # We also need to manually close the socket
-        self.socket.close()

lms/djangoapps/courseware/mock_youtube_server/test_mock_youtube_server.py

@@ -1,53 +0,0 @@
-"""
-Test for Mock_Youtube_Server
-"""
-import unittest
-import threading
-import urllib
-from mock_youtube_server import MockYoutubeServer
-
-from nose.plugins.skip import SkipTest
-
-
-class MockYoutubeServerTest(unittest.TestCase):
-    '''
-    A mock version of the Youtube provider server that listens on a local
-    port and responds with jsonp.
-
-    Used for lettuce BDD tests in lms/courseware/features/video.feature
-    '''
-
-    def setUp(self):
-
-        # This is a test of the test setup,
-        # so it does not need to run as part of the unit test suite
-        # You can re-enable it by commenting out the line below
-        raise SkipTest
-
-        # Create the server
-        server_port = 8034
-        server_host = '127.0.0.1'
-        address = (server_host, server_port)
-        self.server = MockYoutubeServer(address, )
-        self.server.time_to_response = 0.5
-        # Start the server in a separate daemon thread
-        server_thread = threading.Thread(target=self.server.serve_forever)
-        server_thread.daemon = True
-        server_thread.start()
-
-    def tearDown(self):
-
-        # Stop the server, freeing up the port
-        self.server.shutdown()
-
-    def test_request(self):
-        """
-        Tests that Youtube server processes request with right program
-        path,  and responses with incorrect signature.
-        """
-        # GET request
-        response_handle = urllib.urlopen(
-            'http://127.0.0.1:8034/feeds/api/videos/OEoXaMPEzfM?v=2&alt=jsonc&callback=callback_func',
-        )
-        response = response_handle.read()
-        self.assertEqual("""callback_func({"message": "I\'m youtube."})""", response)