Merge pull request #198 from 2gis/selenium-server-request-timeout

Selenium server request timeout

config_template.py

@@ -48,6 +48,7 @@ class Config(object):
     OPENASTACK_VM_META_DATA = {
         'admin_pass': 'testPassw0rd.'
     }
+    OPENSTACK_VM_USERDATA_FILE_PATH = "%s/userdata" % os.path.abspath(os.curdir)
 
     VM_CREATE_CHECK_PAUSE = 5
     VM_CREATE_CHECK_ATTEMPTS = 1000
@@ -63,4 +64,3 @@ class Config(object):
     VMMASTER_AGENT_PORT = 9000
 
     THREAD_POOL_MAX = 100
-

core/constants.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-
 SESSION_CLOSE_REASON_API_CALL = "Session closed via API stop_session call"
 GET_ENDPOINT_ATTEMPTS = 10
 GET_ENDPOINT_WAIT_TIME_INCREMENT = 5
-
 ENDPOINT_REBUILD_ATTEMPTS = 3
+REQUEST_TIMEOUT = 120

core/exceptions.py

@@ -11,15 +11,15 @@ class SessionException(Exception):
     pass
 
 
-class ClonesException(Exception):
+class CreationException(Exception):
     pass
 
 
-class NoMacError(Exception):
+class RequestTimeoutException(Exception):
     pass
 
 
-class CreationException(Exception):
+class RequestException(Exception):
     pass
 
 
@@ -29,11 +29,3 @@ class TimeoutException(Exception):
 
 class ConnectionError(Exception):
     pass
-
-
-class NoSuchEndpoint(Exception):
-    pass
-
-
-class QueueItemNotFound(Exception):
-    pass

core/sessions.py

@@ -9,9 +9,10 @@
 from datetime import datetime
 from flask import current_app
 
+from core import constants
 from core.db import models
 from core.config import config
-from core.exceptions import SessionException
+from core.exceptions import SessionException, RequestException, RequestTimeoutException
 from core.video import VNCVideoHelper
 
 log = logging.getLogger(__name__)
@@ -117,6 +118,8 @@ def save_artifacts(self):
         artifacts = {
             "selenium_server": "/var/log/selenium_server.log"
         }
+        if not self.endpoint_ip:
+            return False
         return self.endpoint.save_artifacts(self, artifacts)
 
     def close(self, reason=None):
@@ -192,7 +195,7 @@ def add_session_step(self, control_line, body=None, created=None):
 
         return step
 
-    def make_request(self, port, request):
+    def make_request(self, port, request, timeout=constants.REQUEST_TIMEOUT):
         """ Make http request to some port in session
             and return the response. """
 
@@ -206,7 +209,8 @@ def req():
             return requests.request(method=request.method,
                                     url=url,
                                     headers=request.headers,
-                                    data=request.data)
+                                    data=request.data,
+                                    timeout=timeout)
 
         t = Thread(target=getresponse, args=(req, q))
         t.daemon = True
@@ -216,8 +220,10 @@ def req():
             yield None, None, None
 
         response = q.get()
+        if isinstance(response, requests.Timeout):
+            raise RequestTimeoutException("No response for '%s' in %s sec. Original: %s" % (url, timeout, response))
         if isinstance(response, Exception):
-            raise response
+            raise RequestException("Error for '%s'. Original: %s" % (url, response))
 
         yield response.status_code, response.headers, response.content
 

tests/unit/data/config_openstack.py

@@ -41,6 +41,7 @@ class Config(object):
     OPENASTACK_VM_META_DATA = {
         'admin_pass': 'testPassw0rd.'
     }
+    OPENSTACK_VM_USERDATA_FILE_PATH = "%s/tests/unit/data/userdata" % os.path.abspath(os.curdir)
 
     VM_CHECK = False
     VM_CHECK_FREQUENCY = 1800

tests/unit/data/userdata

@@ -0,0 +1,3 @@
+#cloud-config
+password: pass
+chpasswd: {expire: False}

tests/unit/test_api.py

@@ -285,4 +285,4 @@ def delete(self):
             body = json.loads(response.data)
             self.assertEqual(200, body['metacode'])
             self.assertEqual("This endpoints were deleted from pool: "
-                             "[%s]" % vm_name_1, body['result'])
+                             "%s" % [vm_name_1], body['result'])