Make .robot the only default test extension

yanne · yanne · commit a5306fb7d8d3 · 2019-09-03T07:29:37.000+03:00
Also allow any extension to be explicitly defined when using a full path to a file or when using `--extension` command line option Fixes robotframework#3269
diff --git a/atest/robot/cli/runner/extension.robot b/atest/robot/cli/runner/extension.robot
@@ -13,10 +13,9 @@ One extension
 Multiple extensions
     -F robot:txt:.ROBOT    44
 
-Invalid extension
-    [Template]    NONE
-    Run Tests Without Processing Output    --extension invalid    ${DATA FORMATS}
-    Stderr Should Be Equal To    [ ERROR ] Invalid extension to limit parsing 'invalid'.${USAGE TIP}\n
+Any extension is accepted
+    --extension bar        1
+    --extension FoO:bar    2
 
 *** Keywords ***
 Expected number of tests should be run
diff --git a/atest/robot/cli/runner/rerunfailed.robot b/atest/robot/cli/runner/rerunfailed.robot
@@ -35,10 +35,10 @@ Suite teardown failures are noticed
 *** Keywords ***
 Suite initialization
     Copy Directory    ${ORIG DIR}/suite    ${SUITE DIR}
-    Copy File    ${ORIG DIR}/runfailed1.robot    ${SUITE DIR}/runfailed.txt
+    Copy File    ${ORIG DIR}/runfailed1.robot    ${SUITE DIR}/runfailed.robot
     Run Tests    ${EMPTY}    ${SUITE DIR}
     Copy File    ${OUTFILE}    ${RUN FAILED FROM}
-    Copy File    ${ORIG DIR}/runfailed2.robot    ${SUITE DIR}/runfailed.txt
+    Copy File    ${ORIG DIR}/runfailed2.robot    ${SUITE DIR}/runfailed.robot
     Run Tests    --rerunfailed ${RUN FAILED FROM} --test Selected --exclude excluded_tag    ${SUITE DIR}
 
 Test Should Have Been Executed
diff --git a/atest/robot/cli/runner/rerunfailedsuites.robot b/atest/robot/cli/runner/rerunfailedsuites.robot
@@ -29,10 +29,10 @@ Non-existing failing from output file is not executed
 *** Keywords ***
 Suite initialization
     Copy Directory    ${ORIG DIR}/suite    ${SUITE DIR}
-    Copy File    ${ORIG DIR}/runfailed1.robot     ${SUITE DIR}/runfailed.txt
+    Copy File    ${ORIG DIR}/runfailed1.robot     ${SUITE DIR}/runfailed.robot
     Run Tests    ${SUITE DIR}
     Copy File    ${OUTFILE}    ${RUN FAILED FROM}
-    Copy File    ${ORIG DIR}/runfailed2.robot     ${SUITE DIR}/runfailed.txt
+    Copy File    ${ORIG DIR}/runfailed2.robot     ${SUITE DIR}/runfailed.robot
     Run Tests    --rerunfailedsuites ${RUN FAILED FROM} --noncritical non_critical --exclude excluded_tag ${SUITE DIR}
 
 Test Should Have Been Executed
diff --git a/atest/robot/parsing/data_formats/mixed.robot b/atest/robot/parsing/data_formats/mixed.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Resource          formats_resource.robot
-Suite Setup       Run tests    ${EMPTY}    ${MIXEDDIR}
+Suite Setup       Run tests    -F txt:tsv    ${MIXEDDIR}
 
 *** Variables ***
 @{TSV TESTS}      TSV Passing     TSV Failing    TXT Resource
diff --git a/atest/robot/parsing/data_formats/rest.robot b/atest/robot/parsing/data_formats/rest.robot
@@ -11,7 +11,7 @@ ReST With reST Resource
     Check Test Case    Resource File
 
 ReST Directory
-    Run Suite Dir And Check Results    ${EMPTY}    ${RESTDIR}
+    Run Suite Dir And Check Results    -F rst:rest    ${RESTDIR}
 
 Directory With reST Init
     Previous Run Should Have Been Successful
diff --git a/atest/testdata/parsing/data_formats/foo.bar b/atest/testdata/parsing/data_formats/foo.bar
@@ -0,0 +1,3 @@
+*** Test cases ***
+Foo.Bar test
+   No Operation
diff --git a/atest/testdata/parsing/data_formats/rest/with_init/sub_suite1.RST b/atest/testdata/parsing/data_formats/rest/with_init/sub_suite1.RST
diff --git a/atest/testdata/parsing/data_formats/robot/with_init/sub_suite1.ROBOT b/atest/testdata/parsing/data_formats/robot/with_init/sub_suite1.ROBOT
diff --git a/atest/testdata/parsing/data_formats/tsv/with_init/sub_suite1.TSV b/atest/testdata/parsing/data_formats/tsv/with_init/sub_suite1.TSV
diff --git a/atest/testdata/parsing/data_formats/txt/with_init/sub_suite1.TXT b/atest/testdata/parsing/data_formats/txt/with_init/sub_suite1.TXT
diff --git a/atest/testdata/parsing/data_formats/valid.foo b/atest/testdata/parsing/data_formats/valid.foo
@@ -0,0 +1,3 @@
+*** Test cases ***
+Valid.Foo test
+   No Operation
diff --git a/src/robot/libdocpkg/builder.py b/src/robot/libdocpkg/builder.py
@@ -16,7 +16,6 @@
 import os
 
 from robot.errors import DataError
-from robot.parsing import TEST_EXTENSIONS
 from robot.utils import JYTHON, JAVA_VERSION
 
 from .robotbuilder import LibraryDocBuilder, ResourceDocBuilder
@@ -31,7 +30,7 @@ def JavaDocBuilder():
         raise DataError('Documenting Java test libraries requires Jython.')
 
 
-RESOURCE_EXTENSIONS = (TEST_EXTENSIONS | {'resource'})
+RESOURCE_EXTENSIONS = {'resource', 'robot', 'txt', 'tsv', 'rst', 'rest'}
 
 
 def DocumentationBuilder(library_or_resource):
diff --git a/src/robot/parsing/__init__.py b/src/robot/parsing/__init__.py
@@ -57,10 +57,6 @@ def print_suite(suite):
 from . import lexerwrapper
 
 
-# TODO: remove/inline
-TEST_EXTENSIONS = {"robot", "txt", "tsv", "rest", "rst"}
-
-
 def get_test_case_file_ast(source):
     return RobotFrameworkParser(TestCaseFileLexer()).parse(source)
 
diff --git a/src/robot/running/builder/suitestructure.py b/src/robot/running/builder/suitestructure.py
@@ -18,7 +18,6 @@
 from robot.errors import DataError
 from robot.model import SuiteNamePatterns
 from robot.output import LOGGER
-from robot.parsing import TEST_EXTENSIONS
 from robot.utils import abspath, unic
 
 
@@ -46,15 +45,12 @@ class SuiteStructureBuilder(object):
 
     def __init__(self, include_suites, include_extensions):
         self.include_suites = include_suites
-        self.include_extensions = self._get_extensions(include_extensions)
+        self.accepted_extensions = self._get_extensions(include_extensions)
 
     def _get_extensions(self, extension):
         if not extension:
-            return None
-        extensions = set(ext.lower().lstrip('.') for ext in extension.split(':'))
-        if not all(ext in TEST_EXTENSIONS for ext in extensions):
-            raise DataError("Invalid extension to limit parsing '%s'." % extension)
-        return extensions
+            return {'robot'}
+        return {ext.lower().lstrip('.') for ext in extension.split(':')}
 
     def build(self, paths):
         paths = self._validate_paths(paths)
@@ -107,7 +103,8 @@ def _get_child_paths(self, dirpath, incl_suites=None):
                 if not init_file:
                     init_file = path
                 else:
-                    LOGGER.error("Ignoring second test suite init file '%s'." % path)
+                    LOGGER.error("Ignoring second test suite init file '%s'."
+                                 % path)
             else:
                 paths.append(path)
         return init_file, paths
@@ -129,21 +126,16 @@ def _list_dir(self, dir_path, incl_suites):
                 LOGGER.info("Ignoring file or directory '%s'." % path)
 
     def _is_init_file(self, path, base, ext):
-        return (base.lower() == '__init__' and
-                self._extension_is_accepted(ext) and
-                os.path.isfile(path))
-
-    def _extension_is_accepted(self, ext):
-        if self.include_extensions:
-            return ext in self.include_extensions
-        return ext in TEST_EXTENSIONS
+        return (base.lower() == '__init__'
+                and ext in self.accepted_extensions
+                and os.path.isfile(path))
 
     def _is_included(self, path, base, ext, incl_suites):
         if base.startswith(self.ignored_prefixes):
             return False
         if os.path.isdir(path):
             return base not in self.ignored_dirs or ext
-        if not self._extension_is_accepted(ext):
+        if ext not in self.accepted_extensions:
             return False
         return self._is_in_included_suites(base, incl_suites)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+* Test cases *`
	`2`	`+Foo.Bar test`
	`3`	`+ No Operation`