Merge b9d5f96 into 0956515

Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [dev-packages]
-pylint = "*"
+pylint = "<2.0.0"
 
 [packages]
 "e1839a8" = {editable = true, path = "."}

aimmo-game-worker/avatar_runner.py

@@ -5,7 +5,8 @@
 
 from six import StringIO
 
-from simulation.action import WaitAction
+from simulation.action import WaitAction, Action
+from user_exceptions import InvalidActionException
 
 LOGGER = logging.getLogger(__name__)
 
@@ -41,8 +42,7 @@ def process_avatar_turn(self, world_map, avatar_state, src_code):
             sys.stderr = output_log
             self._update_avatar(src_code)
 
-            action = self.avatar.handle_turn(world_map, avatar_state)
-            action = action.serialise()
+            action = self.decide_action(world_map, avatar_state)
 
         except Exception as e:
             traceback.print_exc()
@@ -56,3 +56,9 @@ def process_avatar_turn(self, world_map, avatar_state, src_code):
 
         logs = output_log.getvalue()
         return {'action': action, 'log': logs, 'avatar_updated': avatar_updated}
+
+    def decide_action(self, world_map, avatar_state):
+        action = self.avatar.handle_turn(world_map, avatar_state)
+        if not isinstance(action, Action):
+            raise InvalidActionException(action)
+        return action.serialise()

aimmo-game-worker/setup.py

@@ -13,6 +13,7 @@
     ],
     tests_require=[
         'httmock',
+        'mock'
     ],
     test_suite='tests',
     zip_safe=False,

aimmo-game-worker/simulation/action.py

@@ -1,7 +1,12 @@
-class Action(object):
+from abc import ABCMeta, abstractmethod
 
+
+class Action:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
     def serialise(self):
-        raise NotImplementedError
+        pass
 
 
 class WaitAction(Action):

aimmo-game-worker/tests/test_avatar_runner.py

@@ -1,5 +1,9 @@
 from unittest import TestCase
+
+import mock
+
 from avatar_runner import AvatarRunner
+from user_exceptions import InvalidActionException
 
 NORTH = {'x': 0, 'y': 1}
 SOUTH = {'x': 0, 'y': -1}
@@ -100,3 +104,15 @@ def test_update_code_flag_with_syntax_errors(self):
         self.assertTrue(response['avatar_updated'])
         response = runner.process_avatar_turn(world_map={}, avatar_state={}, src_code=avatar)
         self.assertFalse(response['avatar_updated'])
+
+    def test_invalid_action_exception(self):
+        avatar = '''class Avatar(object):
+                        def handle_turn(self, world_map, avatar_state):
+                            from simulation.action import MoveAction
+                            from simulation.direction import NORTH
+                            
+                  '''
+        runner = AvatarRunner()
+        runner._update_avatar(src_code=avatar)
+        with self.assertRaises(InvalidActionException):
+            runner.decide_action(world_map={}, avatar_state={})

aimmo-game-worker/user_exceptions.py

@@ -0,0 +1,4 @@
+class InvalidActionException(Exception):
+    def __init__(self, invalid_action_object):
+        message = '"{}" is not a valid action object.'.format(invalid_action_object)
+        super(InvalidActionException, self).__init__(message)