Merge branch 'Issue-#133-re-run-test' of https://github.com/damies13/…

…rfswarm into Issue-#133-re-run-test
damies13 · Aug 21, 2023 · 5d01fca · 5d01fca
2 parents 3a22243 + 33ee239
commit 5d01fca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/rfswarm_agent/rfswarm_agent.py b/rfswarm_agent/rfswarm_agent.py
@@ -901,13 +901,22 @@ def runthread(self, jobid):
 		if not self.xmlmode:
 			cmd.append("--listener {}".format('"' + self.listenerfile + '"'))
 
-		if "TestRepeater" in self.jobs[jobid]:
-			if self.str2bool(self.jobs[jobid]["TestRepeater"]):
+		self.debugmsg(9, "runthread: cmd:", cmd)
+
+		self.debugmsg(9, "Check for runthread: robotexe")
+		if "testrepeater" in self.jobs[jobid]:
+			self.debugmsg(7, "runthread: self.jobs[jobid][testrepeater]:", self.jobs[jobid]["testrepeater"])
+			self.debugmsg(9, "runthread: self.jobs[jobid][testrepeater]:", self.str2bool(self.jobs[jobid]["testrepeater"]), type(self.str2bool(self.jobs[jobid]["testrepeater"])))
+			if self.str2bool(self.jobs[jobid]["testrepeater"]):
 				cmd.append("--listener {}".format('"' + self.repeaterfile + '"'))
 
+		self.debugmsg(9, "runthread: cmd:", cmd)
+
 		if "robotoptions" in self.jobs[jobid]:
 			cmd.append("{}".format(self.jobs[jobid]['robotoptions']))
 
+		self.debugmsg(9, "runthread: cmd:", cmd)
+
 		cmd.append("-o")
 		cmd.append('"' + outputFile + '"')
 

diff --git a/rfswarm_manager/rfswarm.py b/rfswarm_manager/rfswarm.py
@@ -2999,7 +2999,7 @@ def run_start_threads(self):
 											tr = base.scriptdefaults["testrepeater"]
 										if "testrepeater" in grp:
 											tr = grp["testrepeater"]
-										base.robot_schedule["Agents"][nxtagent][grurid]["robotoptions"] = str(tr)
+										base.robot_schedule["Agents"][nxtagent][grurid]["testrepeater"] = str(tr)
 
 										base.Agents[nxtagent]["AssignedRobots"] += 1
 										base.debugmsg(5, "base.Agents[", nxtagent, "][AssignedRobots]:", base.Agents[nxtagent]["AssignedRobots"])