From 0e596dd517e5024d18d82a839d0a2789bbaca898 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Fri, 17 Feb 2017 09:10:57 -0500 Subject: [PATCH] Multi-thread stub servers. --- common/djangoapps/terrain/stubs/http.py | 3 ++- lms/djangoapps/courseware/features/lti.py | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/common/djangoapps/terrain/stubs/http.py b/common/djangoapps/terrain/stubs/http.py index 5262390975..dedfa0a980 100644 --- a/common/djangoapps/terrain/stubs/http.py +++ b/common/djangoapps/terrain/stubs/http.py @@ -3,6 +3,7 @@ Stub implementation of an HTTP service. """ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler +from SocketServer import ThreadingMixIn import urllib import urlparse import threading @@ -233,7 +234,7 @@ class StubHttpRequestHandler(BaseHTTPRequestHandler, object): self.send_response(200) -class StubHttpService(HTTPServer, object): +class StubHttpService(ThreadingMixIn, HTTPServer, object): """ Stub HTTP service implementation. """ diff --git a/lms/djangoapps/courseware/features/lti.py b/lms/djangoapps/courseware/features/lti.py index 8d699f9f6f..56ba36eb9d 100644 --- a/lms/djangoapps/courseware/features/lti.py +++ b/lms/djangoapps/courseware/features/lti.py @@ -363,16 +363,7 @@ def click_grade(_step, version): css_ele = version_map[version]['selector'] css_loc = '#' + css_ele world.wait_for_visible(css_loc) - print 'waiting..' - # from nose.tools import set_trace; set_trace() - world.wait(8) - print 'proceding' - # world.css_click(css_loc) - # ele = world.css_find(css_loc).first - # ele._element.send_keys(Keys.ENTER) - # world.browser.execute_script('document.getElementById("{}").click()'.format(css_ele)) world.css_click(css_loc) - # world.css_click(css_loc) assert iframe.is_text_present(version_map[version]['expected_text'])