Fix handling paths like path/file.py/../file.robot

pekkaklarck · yanne · commit 947db35f893a · 2019-09-03T07:29:37.000+03:00
diff --git a/src/robot/running/builder/suitestructure.py b/src/robot/running/builder/suitestructure.py
@@ -53,25 +53,25 @@ def _get_extensions(self, extension):
         return {ext.lower().lstrip('.') for ext in extension.split(':')}
 
     def build(self, paths):
-        paths = self._validate_paths(paths)
+        paths = list(self._normalize_paths(paths))
         if len(paths) == 1:
             return self._build(paths[0], self.include_suites)
         children = [self._build(p, self.include_suites) for p in paths]
         return SuiteStructure(children=children)
 
-    def _validate_paths(self, paths):
+    def _normalize_paths(self, paths):
         if not paths:
             raise DataError('One or more source paths required.')
         for path in paths:
+            path = os.path.normpath(path)
             if not os.path.exists(path):
                 raise DataError("Parsing '%s' failed: File or directory to "
                                 "execute does not exist." % path)
-        return [abspath(p) for p in paths]
+            yield abspath(path)
 
     def _build(self, path, include_suites):
-        if not os.path.exists(path) or os.path.isfile(path):
+        if os.path.isfile(path):
             return SuiteStructure(path)
-
         include_suites = self._get_include_suites(path, include_suites)
         init_file, paths = self._get_child_paths(path, include_suites)
         children = [self._build(p, include_suites) for p in paths]
diff --git a/utest/api/test_exposed_api.py b/utest/api/test_exposed_api.py
@@ -43,8 +43,10 @@ def test_result_objects(self):
 
 
 class TestTestSuiteBuilder(unittest.TestCase):
-    sources = [join(abspath(__file__), '..', '..', '..', 'atest', 'testdata', 'misc', n)
-               for n in ('pass_and_fail.robot', 'normal.robot')]
+    # This list has paths like `/path/file.py/../file.robot` on purpose.
+    # They don't work unless normalized.
+    sources = [join(__file__, '../../../atest/testdata/misc', name)
+               for name in ('pass_and_fail.robot', 'normal.robot')]
 
     def test_create_with_datasources_as_list(self):
         suite = api.TestSuiteBuilder().build(*self.sources)
