Handle non-readable directories gracefully

yanne · yanne · commit db735a660147 · 2019-09-03T07:29:37.000+03:00
Fixes robotframework#3268
diff --git a/atest/resources/TestHelper.py b/atest/resources/TestHelper.py
@@ -1,5 +1,5 @@
 import os
-from stat import S_IREAD, S_IWRITE
+from stat import S_IREAD, S_IWRITE, S_IEXEC
 
 from robot.api import logger
 
@@ -12,6 +12,12 @@ def set_read_only(self, path):
     def set_read_write(self, path):
         os.chmod(path, S_IREAD | S_IWRITE)
 
+    def set_read_write_execute(self, path):
+        os.chmod(path, S_IREAD | S_IWRITE | S_IEXEC)
+
+    def remove_permissions(self, path):
+        os.chmod(path, 0)
+
     def file_should_have_correct_line_separators(self, output, sep=os.linesep):
         if os.path.isfile(output):
             with open(output, 'rb') as infile:
diff --git a/atest/robot/parsing/invalid.robot b/atest/robot/parsing/invalid.robot
@@ -3,6 +3,7 @@ Resource          data_formats/formats_resource.robot
 
 *** Variables ***
 ${PARSING}            ${DATADIR}/parsing
+${SUITE DIR}          %{TEMPDIR}/tmp
 
 *** Test Cases ***
 Directory Containing No Test Cases
@@ -53,6 +54,23 @@ Multisource Containing File With Invalid Encoding
     ...    UnicodeDecodeError: .*
     ...    ${PARSING}/invalid_encoding/invalid_encoding.robot
 
+File without read permission
+    [Setup]    Create test data without permissions    ${SUITE DIR}/sample.robot
+    Run tests and check parsing error
+    ...    ${SUITE DIR}/sample.robot
+    ...    (IOError|PermissionError): .*
+    ...    ${SUITE DIR}/sample.robot
+    [Teardown]    Remove test data without permissions    ${SUITE DIR}/sample.robot
+
+Directory without read permission
+    [Setup]    Create test data without permissions    ${SUITE DIR}
+    Run tests and check parsing error
+    ...    ${SUITE DIR}
+    ...    (OSError|PermissionError): .*
+    ...    ${SUITE DIR}
+    ...    Reading directory
+    [Teardown]    Remove test data without permissions    ${SUITE DIR}
+
 *** Keywords ***
 Run tests and check error
     [Arguments]    ${paths}   ${error}
@@ -61,6 +79,17 @@ Run tests and check error
     Check Stderr Matches Regexp    \\[ ERROR \\] ${error}${USAGE_TIP}
 
 Run tests and check parsing error
-    [Arguments]    ${paths}    ${error}    ${file}
-    ${file}=   Normalize path    ${file}
-    Run tests and check error    ${paths}    Parsing '${file}' failed: ${error}
+    [Arguments]    ${paths}    ${error}    ${path}    ${prefix}=Parsing
+    ${path}=   Normalize path    ${path}
+    Run tests and check error    ${paths}    ${prefix} '${path}' failed: ${error}
+
+Create test data without permissions
+    [Arguments]    ${remove permissions}
+    Create directory    ${SUITE DIR}
+    Copy file   ${ROBOTDIR}/sample.robot   ${SUITE DIR}
+    Remove permissions    ${remove permissions}
+
+Remove test data without permissions
+    [Arguments]    ${remove permissions}
+    Set read write execute      ${remove permissions}
+    Remove directory    ${SUITE DIR}    recursive=True
diff --git a/src/robot/running/builder/suitestructure.py b/src/robot/running/builder/suitestructure.py
@@ -18,7 +18,7 @@
 from robot.errors import DataError
 from robot.model import SuiteNamePatterns
 from robot.output import LOGGER
-from robot.utils import abspath, unic
+from robot.utils import abspath, get_error_message, unic
 
 
 class SuiteStructure(object):
@@ -112,7 +112,11 @@ def _get_child_paths(self, dirpath, incl_suites=None):
     def _list_dir(self, dir_path, incl_suites):
         # os.listdir returns Unicode entries when path is Unicode
         dir_path = unic(dir_path)
-        names = os.listdir(dir_path)
+        try:
+            names = os.listdir(dir_path)
+        except:
+            raise DataError("Reading directory '%s' failed: %s"
+                            % (dir_path, get_error_message()))
         for name in sorted(names, key=lambda item: item.lower()):
             name = unic(name)  # needed to handle nfc/nfd normalization on OSX
             path = os.path.join(dir_path, name)
