Agent test bugfixes et updated doc scenario test

Etienne Pallier
1 parent e756352f
Showing 2 changed files with 32 additions and 51 deletions Show diff stats
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/common/models.py
@@ -355,16 +355,18 @@ class Agent:
     TEST_WITH_FINAL_TEST = False
  
  
-    # (EP 2022/06) Default SCENARIO to be executed (only in TEST mode)
+    # (EP 2022/07) Default SCENARIO to be executed (only in TEST mode)
     # 
-    # List of commands to be sent by this agent to other agents ("self" means himself)
+    # It is a list of commands to be sent by this agent to other agents ("self" means himself)
     #
-    # Command format is :
-    # "[Recipient] Command [Args]"
-    # with :
-    # - [Recipient] optional, the name of the Agent the command is to be sent to (use "self" to mean himself)
-    # - Command, the command name
-    # - [Args] optional, the list of command arguments, separated by blanks : arg1 arg2 arg3 ...
+    # Format : List of tuples (command, expected_res), with :
+    #   
+    #   - command : the command format is "recipient cmd args", with :
+    #       - recipient : name of the Agent that the command is to be sent to (use "self" to mean himself)
+    #       - cmd : the command name
+    #       - args : (optional) the list of command arguments, separated by blanks : arg1 arg2 arg3 ...
+    #       
+    #   - expected_res : le résultat attendu
     # 
     # Ex :
     # - "AgentScheduler set_state ATTENTIVE" => means to send the command "set_state ATTENTIVE" to the agent AgentScheduler
@@ -372,57 +374,32 @@ class Agent:
     # - "self set_state ATTENTIVE" => means to send the command "set_state ATTENTIVE" to MYSELF
     # - "self do_restart_loop" => means to send the command "do_restart_loop" to MYSELF (no args)
     #
-    #TEST_COMMANDS = iter([
-
-    ''' 
-    NEW FORMAT
     TEST_COMMANDS_LIST = [
-        # 1) First, 3 EXCEPTION CASES :
-        # Uncomment to activate exception
  
-        # - Agent general command malformed (missing arg) => ko, AgentCmdBadArgsException
-        #"Agent set_state",
-        
-        # - Agent specific command, known but not implemented => ko, AgentCmdUnimplementedException
-        #"self set_specific2",
-        
-        # - Agent specific command, implemented but missing args => ko, AgentCmdBadArgsException
-        #"    self      do_specific1    1   ",
-        [ "self", "do_specific1", [ 1, 2, 3.5, 'titi', (3,'titi',5), [1,3,5,7,9] ] ],
-
-        # 2) NORMAL CASES
+        # 1) First, 3 EXCEPTION CASES (uncomment to activate exception)
+        # ------------------------------------------------------------
  
-        # Agent general command => ok
-        #"Agent set_state ATTENTIVE",
-        [ "Agent", "set_state", ["ATTENTIVE"] ],
-    ]
-    '''
-
-    TEST_COMMANDS_LIST = [
-
-        # 1) First, 3 EXCEPTION CASES :
-        # Uncomment to activate exception
+        # - Agent command, unknown => ko, UnknownCmdException
+        ("self do_unknown", None),
  
         # - Agent general command malformed (missing arg) => ko, AgentCmdBadArgsException
-        #"Agent set_state",
+        #("Agent set_mode", None),
  
         # - Agent specific command, known but not implemented => ko, AgentCmdUnimplementedException
-        #"self set_specific2",
+        #("self set_specific2", None),
  
         # - Agent specific command, implemented but missing args => ko, AgentCmdBadArgsException
-        #"    self      do_specific1    1   ",
-
-        # - Agent command, unknown => ko, UnknownCmdException
-        #"self do_specific3",
+        #("    self      do_specific1    1   ", None),
  
  
         # 2) NORMAL CASES (test scenario)
-
+        # -------------------------------
  
         # Agent general command
         ("Agent set_mode ATTENTIVE", "MODE = ATTENTIVE"),
         # => should get "ATTENTIVE"
         ("self get_mode", "MODE = ATTENTIVE"),
+
         # => should get "7"
         ("self do_eval 3+5-1", 7),
  
@@ -449,17 +426,17 @@ class Agent:
  
         # TODO: test priority commands : do_abort, do_flush_cmds, ...
         # - Stop executing new commands (just let them accumulate)
-        ##"self do_stop_exec",
-        ##"self set_mode ATTENTIVE",
-        ##"self get_mode",
-        ##"self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]",
-        ##"self set_mode ROUTINE",
-        ##"self get_mode",
-        ##"self do_abort",
+        ##("self do_stop_exec",),
+        ##("self set_mode ATTENTIVE",),
+        ##("self get_mode",),
+        ##("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]",),
+        ##("self set_mode ROUTINE",),
+        ##("self get_mode",),
+        ##("self do_abort",),
         # - Now, resume execution of commands :
         # we should have the previous list pending,
         # but as "do_abort" is priority, it should be executed first even if last !
-        ##"self do_resume_exec",
+        ##("self do_resume_exec",),
  
         # Restart the restart loop (from init())
         ("self do_restart_loop", "RESTARTING"),
@@ -2161,7 +2138,8 @@ class Agent:
         if self.TEST_MODE: log.info("in TEST MODE")
  
     def _TEST_get_next_command_to_send(self)->AgentCmd:
-        (cmd_full_name, res_expected) = next(self.TEST_COMMANDS, (None,None))
+        cmd_full_name, res_expected = next(self.TEST_COMMANDS, (None,None))
+        #print(cmd_full_name, res_expected)
         #return cmd_name
         if cmd_full_name is None: return None
         # Remove excessive spaces
@@ -491,6 +491,9 @@ class AgentCmd(models.Model):
  
         # SET commands
         # -----------
+
+        # - Set agent current STATE (IN_MAIN_LOOP, ...) => forbidden
+        #"set_state",
  
         # - Set agent current MODE (idle, routine, attentive)
         "set_mode", # + value to set