better qemu_static parameter mangle in deboostrap management, tests

salt/modules/genesis.py

@@ -17,10 +17,10 @@
     from pipes import quote as _cmd_quote
 
 # Import salt libs
-import salt.utils
 import salt.utils.yast
 import salt.utils.preseed
 import salt.utils.kickstart
+import salt.utils.validate.path
 import salt.syspaths
 from salt.exceptions import SaltInvocationError
 
@@ -403,6 +403,11 @@ def _bootstrap_deb(
         log.error('Required tool debootstrap is not installed.')
         return False
 
+    if static_qemu and not salt.utils.validate.path.is_executable(static_qemu):
+        log.error('Required tool qemu not '
+                  'present/readable at: {0}'.format(static_qemu))
+        return False
+
     if isinstance(pkgs, (list, tuple)):
         pkgs = ','.join(pkgs)
     if isinstance(exclude_pkgs, (list, tuple)):
@@ -427,11 +432,13 @@ def _bootstrap_deb(
 
     __salt__['cmd.run'](deb_args, python_shell=False)
 
-    __salt__['cmd.run'](
-        'cp {qemu} {root}/usr/bin/'.format(
-            qemu=_cmd_quote(static_qemu), root=_cmd_quote(root)
+    if static_qemu:
+        __salt__['cmd.run'](
+            'cp {qemu} {root}/usr/bin/'.format(
+                qemu=_cmd_quote(static_qemu), root=_cmd_quote(root)
+            )
         )
-    )
+
     env = {'DEBIAN_FRONTEND': 'noninteractive',
            'DEBCONF_NONINTERACTIVE_SEEN': 'true',
            'LC_ALL': 'C',

salt/utils/validate/path.py

@@ -64,3 +64,14 @@ def is_readable(path):
 
     # The path does not exist
     return False
+
+
+def is_executable(path):
+    '''
+    Check if a given path is executable by the current user.
+
+    :param path: The path to check
+    :returns: True or False
+    '''
+
+    return os.access(path, os.X_OK)

tests/unit/modules/genesis_test.py

@@ -97,9 +97,11 @@ def test_bootstrap(self):
                                                'cmd.run': MagicMock(),
                                                'disk.blkid': MagicMock(return_value={})}):
                 with patch('salt.modules.genesis.salt.utils.which', return_value=True):
-                    param_set['params'].update(common_parms)
-                    self.assertEqual(genesis.bootstrap(**param_set['params']), None)
-                    genesis.__salt__['cmd.run'].assert_any_call(param_set['cmd'], python_shell=False)
+                    with patch('salt.modules.genesis.salt.utils.validate.path.is_readable',
+                               return_value=True):
+                        param_set['params'].update(common_parms)
+                        self.assertEqual(genesis.bootstrap(**param_set['params']), None)
+                        genesis.__salt__['cmd.run'].assert_any_call(param_set['cmd'], python_shell=False)
 
         with patch.object(genesis, '_bootstrap_pacman', return_value='A') as pacman_patch:
             with patch.dict(genesis.__salt__, {'mount.umount': MagicMock(),