Moved stub servers to terrain

Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.

common/lib/xmodule/xmodule/util/mock_youtube_server/mock_youtube_server.py

@@ -1,125 +0,0 @@
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-import json
-import mock
-import sys
-import threading
-import time
-import urlparse
-from logging import getLogger
-
-
-logger = getLogger(__name__)
-
-class MockYoutubeRequestHandler(BaseHTTPRequestHandler):
-    '''
-    A handler for Youtube GET requests.
-    '''
-
-    protocol = "HTTP/1.0"
-
-    def log_message(self, format, *args):
-        """Log an arbitrary message."""
-        # Code copied from BaseHTTPServer.py. Changed to write to sys.stdout
-        # so that messages won't pollute test output.
-        sys.stdout.write("%s - - [%s] %s\n" %
-                         (self.client_address[0],
-                          self.log_date_time_string(),
-                          format % args))
-
-    def do_HEAD(self):
-        code = 200
-        if 'test_transcripts_youtube' in self.path:
-            if not 'trans_exist' in self.path:
-                code = 404
-        self._send_head(code)
-
-    def do_GET(self):
-        '''
-        Handle a GET request from the client and sends response back.
-        '''
-        logger.debug("Youtube provider received GET request to path {}".format(
-            self.path)
-        )  # Log the request
-
-        if 'test_transcripts_youtube' in self.path:
-            if 't__eq_exist' in self.path:
-                status_message = """<?xml version="1.0" encoding="utf-8" ?><transcript><text start="1.0" dur="1.0">Equal transcripts</text></transcript>"""
-                self._send_head()
-                self._send_transcripts_response(status_message)
-            elif 't_neq_exist' in self.path:
-                status_message = """<?xml version="1.0" encoding="utf-8" ?><transcript><text start="1.1" dur="5.5">Transcripts sample, different that on server</text></transcript>"""
-                self._send_head()
-                self._send_transcripts_response(status_message)
-            else:
-                self._send_head(404)
-        elif 'test_youtube' in self.path:
-            self._send_head()
-            #testing videoplayers
-            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_video_response(status_message)
-        else:
-            # unused url
-            self._send_head()
-            self._send_transcripts_response('Unused url')
-            logger.debug("Request to unused url.")
-
-    def _send_head(self, code=200):
-        '''
-        Send the response code and MIME headers
-        '''
-
-        self.send_response(code)
-        self.send_header('Content-type', 'text/html')
-        self.end_headers()
-
-    def _send_transcripts_response(self, message):
-        '''
-        Send message back to the client for transcripts ajax requests.
-        '''
-        response = message
-        # Log the response
-        logger.debug("Youtube: sent response {}".format(message))
-
-        self.wfile.write(response)
-
-    def _send_video_response(self, message):
-        '''
-        Send message back to the client for video player requests.
-        Requires sending back callback id.
-        '''
-        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()

common/lib/xmodule/xmodule/util/mock_youtube_server/test_mock_youtube_server.py

@@ -1,77 +0,0 @@
-"""
-Test for Mock_Youtube_Server
-"""
-import unittest
-import threading
-import requests
-from mock_youtube_server import MockYoutubeServer
-
-
-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):
-
-        # 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
-
-        # unused url
-        response = requests.get(
-            'http://127.0.0.1:8034/some url',
-        )
-        self.assertEqual("Unused url", response.content)
-
-        # video player test url, callback shoud be presented in url params
-        response = requests.get(
-            'http://127.0.0.1:8034/test_youtube/OEoXaMPEzfM?v=2&alt=jsonc&callback=callback_func',
-        )
-        self.assertEqual("""callback_func({"message": "I\'m youtube."})""", response.content)
-
-        # transcripts test url
-        response = requests.get(
-            'http://127.0.0.1:8034/test_transcripts_youtube/t__eq_exist',
-        )
-        self.assertEqual(
-            '<?xml version="1.0" encoding="utf-8" ?><transcript><text start="1.0" dur="1.0">Equal transcripts</text></transcript>',
-            response.content
-        )
-
-        # transcripts test url
-        response = requests.get(
-            'http://127.0.0.1:8034/test_transcripts_youtube/t_neq_exist',
-        )
-        self.assertEqual(
-            '<?xml version="1.0" encoding="utf-8" ?><transcript><text start="1.1" dur="5.5">Transcripts sample, different that on server</text></transcript>',
-            response.content
-        )
-
-        # transcripts test url, not trans_exist youtube_id, so 404 should be returned
-        response = requests.get(
-            'http://127.0.0.1:8034/test_transcripts_youtube/some_id',
-        )
-        self.assertEqual(404, response.status_code)