Merge pull request #109 from gregoil/ctrl_c_cleanup_fix

Ctrl c cleanup fix

setup.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import
 from setuptools import setup, find_packages
 
-__version__ = "5.1.0"
+__version__ = "5.1.1"
 
 result_handlers = [
     "db = rotest.core.result.handlers.db_handler:DBHandler",

src/rotest/api/resource_control/lock_resources.py

@@ -144,8 +144,13 @@ def post(self, request, sessions, *args, **kwargs):
             If one of the resources fails to lock, all the resources that has
             been locked until that resource will be released.
         """
+        try:
+            session = sessions[request.model.token]
+
+        except KeyError:
+            raise BadRequest("Invalid token/test_id provided!")
+
         username = get_username(request)
-        session = sessions[request.model.token]
         descriptors = request.model.descriptors
 
         if not auth_models.User.objects.filter(username=username).exists():

src/rotest/api/resource_control/release_resources.py

@@ -6,6 +6,7 @@
 from django.db import transaction
 from django.core.exceptions import ObjectDoesNotExist
 from swaggapi.api.builder.server.response import Response
+from swaggapi.api.builder.server.exceptions import BadRequest
 from swaggapi.api.builder.server.request import DjangoRequestView
 
 from rotest.management import ResourceData
@@ -86,9 +87,15 @@ def release_resource(cls, resource, username):
     @session_middleware
     def post(self, request, sessions, *args, **kwargs):
         """Release the given resources one by one."""
+        try:
+            session = sessions[request.model.token]
+
+        except KeyError:
+            raise BadRequest("Invalid token/test_id provided!")
+
         errors = {}
         username = get_username(request)
-        session = sessions[request.model.token]
+
         with transaction.atomic():
             for name in request.model.resources:
                 try:

src/rotest/core/result/result.py

@@ -136,6 +136,9 @@ def stopTest(self, test):
         test.logger.debug("Test %r has stopped running", test.data)
 
         test.data.end()
+        if test.data.exception_type is None:
+            test.end(test_outcome=TestOutcome.ERROR, details="Terminated")
+
         test.release_resource_loggers()
         for result_handler in self.result_handlers:
             result_handler.stop_test(test)