Set rpa mode correctly

yanne · yanne · commit 601b7c9b0f17 · 2019-05-30T19:01:25.000+03:00
diff --git a/src/robot/parsing/newparser/nodes.py b/src/robot/parsing/newparser/nodes.py
@@ -29,8 +29,9 @@ def __init__(self, variables):
 class TestCaseSection(Node):
     _fields = ('tests',)
 
-    def __init__(self, tests):
+    def __init__(self, tests, header):
         self.tests = tests
+        self.header = header[0].strip("*").strip()
 
 
 class KeywordSection(Node):
diff --git a/src/robot/parsing/newparser/parser.py b/src/robot/parsing/newparser/parser.py
@@ -173,11 +173,12 @@ def p_variable(self, p):
     def p_testcase_section(self, p):
         '''testcase_section : testcase_header EOS
                             | testcase_header EOS tests'''
-        p[0] = TestCaseSection(p[3] if len(p) == 4 else [])
+        p[0] = TestCaseSection(p[3] if len(p) == 4 else [], p[1])
 
     def p_testcase_header(self, p):
         '''testcase_header : TESTCASE_HEADER
                            | testcase_header TESTCASE_HEADER'''
+        append_to_list_value(p)
 
     def p_keyword_section(self, p):
         '''keyword_section : keyword_header EOS
diff --git a/src/robot/running/newbuilder.py b/src/robot/running/newbuilder.py
@@ -5,12 +5,13 @@
 from robot.errors import DataError
 from robot.parsing import TEST_EXTENSIONS
 from robot.parsing.newparser import builder
+from robot.parsing.newparser.nodes import TestCaseSection
 from robot.model import SuiteNamePatterns
 from robot.running.model import TestSuite, Keyword, ForLoop, ResourceFile
 from robot.utils import abspath
 from robot.variables import VariableIterator
 from robot.output import LOGGER
-from robot.utils import get_error_message, unic
+from robot.utils import normalize, unic
 
 
 def create_fixture(data, type):
@@ -329,6 +330,7 @@ class TestSuiteBuilder(object):
 
     def __init__(self, include_suites=None, extension=None, rpa=None):
         self.rpa = rpa
+        self._rpa_not_given = rpa is None
         self.include_suites = include_suites
         self.extension = extension
 
@@ -372,11 +374,15 @@ def _parse_and_build(self, path, parent_defaults=None, include_suites=None, incl
         else:
             LOGGER.info("Parsing file '%s'." % path)
             suite, _ = self._build_suite(path, name, parent_defaults)
+        suite.rpa = self.rpa
         suite.remove_empty_suites()
         return suite
 
     def _build_suite(self, source, name, parent_defaults):
         data = self._parse(source)
+        test_section = self._get_test_section(data)
+        if self._rpa_not_given and test_section:
+            self._set_execution_mode(test_section, source)
         suite = TestSuite(name=name, source=source)
         defaults = TestDefaults(parent_defaults)
         if data:
@@ -385,6 +391,22 @@ def _build_suite(self, source, name, parent_defaults):
             SuiteBuilder(suite, defaults).visit(data)
         return suite, defaults
 
+    def _get_test_section(self, data):
+        test_sections = [s for s in data.sections if isinstance(s, TestCaseSection)]
+        return test_sections[0] if test_sections else None
+
+    def _set_execution_mode(self, test_section, source):
+        rpa = test_section.header.lower() in ('task', 'tasks')
+        if self.rpa is None:
+            self.rpa = rpa
+        elif self.rpa is not rpa:
+            this, that = ('tasks', 'tests') if rpa else ('tests', 'tasks')
+            raise DataError("Conflicting execution modes. File '%s' has %s "
+                            "but files parsed earlier have %s. Fix headers "
+                            "or use '--rpa' or '--norpa' options to set the "
+                            "execution mode explicitly."
+                            % (source, this, that))
+
     def _parse(self, path):
         try:
             return builder.get_test_case_file_ast(path)
