Merge pull request #534 from oboehmer/robot61

Updates to support Robot 6.1
mkorpela · May 7, 2023 · 7c8beee · 7c8beee
2 parents fadb9c4 + 6ae1d0e
commit 7c8beee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/pabot/pabot.py b/src/pabot/pabot.py
@@ -1258,6 +1258,7 @@ def _options_for_rebot(options, start_time_string, end_time_string):
         "maxassignlength",
         "maxerrorlines",
         "monitorcolors",
+        "parser",
         "prerunmodifier",
         "quiet",
         "randomize",

diff --git a/src/pabot/result_merger.py b/src/pabot/result_merger.py
@@ -56,7 +56,7 @@ def merge(self, merged):
         try:
             self._set_prefix(merged.source)
             merged.suite.visit(self)
-            self.root.metadata._add_initial(merged.suite.metadata)
+            self.root.metadata.update(merged.suite.metadata)
             if self.errors != merged.errors:
                 self.errors.add(merged.errors)
         except:

diff --git a/tests/test_pabot.py b/tests/test_pabot.py
@@ -1045,6 +1045,7 @@ def test_rebot_conf(self):
                 "prerunmodifier",
                 "monitorcolors",
                 "language",
+                "parser",
             ]:
                 self.assertFalse(key in options, "%s should not be in options" % key)
             else: