Merge pull request #46675 from dwoz/inspectlib-tests

Skip test when git symlinks are not configured

tests/unit/modules/test_inspect_collector.py

@@ -19,6 +19,8 @@
 # Import Python Libs
 from __future__ import absolute_import
 import os
+import errno
+import subprocess
 
 # Import Salt Testing Libs
 from tests.support.unit import TestCase, skipIf
@@ -33,7 +35,33 @@ from tests.support.mock import (
 from salt.modules.inspectlib.collector import Inspector
 
 
+HAS_SYMLINKS = None
+
+
+def no_symlinks():
+    '''
+    Check if git is installed and has symlinks enabled in the configuration.
+    '''
+    global HAS_SYMLINKS
+    if HAS_SYMLINKS is not None:
+        return not HAS_SYMLINKS
+    output = ''
+    try:
+        output = subprocess.check_output('git config --get core.symlinks', shell=True)
+    except OSError as exc:
+        if exc.errno != errno.ENOENT:
+            raise
+    except subprocess.CalledProcessError:
+        # git returned non-zero status
+        pass
+    HAS_SYMLINKS = False
+    if output.strip() == 'true':
+        HAS_SYMLINKS = True
+    return not HAS_SYMLINKS
+
+
 @skipIf(NO_MOCK, NO_MOCK_REASON)
+@skipIf(no_symlinks(), "Git missing 'core.symlinks=true' config")
 class InspectorCollectorTestCase(TestCase):
     '''
     Test inspectlib:collector:Inspector