ajout des timeout dans le scenario test Agent

Etienne Pallier
1 parent 1a6fd283
Showing 1 changed file with 23 additions and 20 deletions Show diff stats
src/core/pyros_django/agent/Agent.py
@@ -357,13 +357,15 @@ class Agent:
     # 
     # It is a list of commands to be sent by this agent to other agents ("self" means himself)
     #
-    # Format : List of tuples (command, expected_res), with :
+    # Format : List of tuples (command, timeout, 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 ...
     #       
+    #   - timeout : the command timeout (max time allowed for execution, else it is aborted)
+    #
     #   - expected_res : le résultat attendu
     # 
     # Ex :
@@ -378,49 +380,50 @@ class Agent:
         # ------------------------------------------------------------
  
         # - Agent command, unknown => ko, UnknownCmdException
-        #("self do_unknown", None),
+        #("self do_unknown", 1, None),
  
         # - Agent general command malformed (missing arg) => ko, AgentCmdBadArgsException
-        #("Agent set_mode", None),
+        #("Agent set_mode", 1, None),
  
         # - Agent specific command, known but not implemented => ko, AgentCmdUnimplementedException
-        #("self set_specific2", None),
+        #("self set_specific2", 1, None),
  
         # - Agent specific command, implemented but missing args => ko, AgentCmdBadArgsException
-        #("    self      do_specific1    1   ", None),
+        #("    self      do_specific1    1   ", 1, None),
  
  
         # 2) NORMAL CASES (test scenario)
         # -------------------------------
  
         # Agent general command
-        ("Agent set_mode ATTENTIVE", "MODE = ATTENTIVE"),
+        ("Agent set_mode ATTENTIVE", 2, "MODE = ATTENTIVE"),
         # => should get "ATTENTIVE"
-        ("self get_mode", "MODE = ATTENTIVE"),
+        ("self get_mode", 1, "MODE = ATTENTIVE"),
  
         # => should get "7"
-        ("self do_eval 3+5-1", 7),
+        ("self do_eval 3+5-1", 2, 7),
  
         # END, will not go further
-        ("self do_exit", "STOPPING"),
+        #("self do_exit", 2, "STOPPING"),
  
         # Agent specific commands => should be executed
-        ("self do_specific3", ),
-        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 7),
+        ("self do_specific3", 2, None),
+        ("self do_exit", 5, "STOPPING"),
+        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 2, 7),
  
-        ("self set_mode ROUTINE", "MODE = ROUTINE"),
+        ("self set_mode ROUTINE", 2, "MODE = ROUTINE"),
         # => should get "ROUTINE"
-        ("self get_mode", "MODE = ROUTINE"), 
+        ("self get_mode", 2, "MODE = ROUTINE"), 
         # Agent specific command => should be skipped (because not ATTENTIVE)
-        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", "SKIPPED"),
+        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 2, "SKIPPED"),
  
         # From now on, should not run anymore process_before/after
         # => and should skip next specific commands
-        ("self set_mode IDLE", "MODE = IDLE"),
+        ("self set_mode IDLE", 2, "MODE = IDLE"),
         # => should get "IDLE"
-        ("self get_mode", "MODE = IDLE"),
+        ("self get_mode", 2, "MODE = IDLE"),
         # Agent specific command => should be skipped (because not ATTENTIVE)
-        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 'SKIPPED'),
+        ("self do_specific1 1 2 3.5 titi (3,'titi',5) [1,3,5,7,9]", 2, 'SKIPPED'),
  
         # TODO: test priority commands : do_abort, do_flush_cmds, ...
         # - Stop executing new commands (just let them accumulate)
@@ -437,10 +440,10 @@ class Agent:
         ##("self do_resume_exec",),
  
         # Restart the restart loop (from init())
-        ("self do_restart_loop", "RESTARTING"),
+        ("self do_restart_loop", 2, "RESTARTING"),
  
         # Now stop
-        ("self do_exit", "STOPPING"),
+        ("self do_exit", 2, "STOPPING"),
  
         '''
         # specific0 not_executed_because_idle
@@ -2130,7 +2133,7 @@ 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, timeout, res_expected = next(self.TEST_COMMANDS, (None,None,None))
         #print(cmd_full_name, res_expected)
         #return cmd_name
         if cmd_full_name is None: return None