Merge pull request #510 from kyleam/skip-quiet-checks

Author: kyleam

reproman/cmd.py

@@ -249,8 +249,12 @@ def run(self, cmd, log_stdout=True, log_stderr=True, log_online=False,
 
             except Exception as e:
                 prot_exc = e
-                lgr.error("Failed to start %r%r: %s" %
-                          (cmd, " under %r" % cwd if cwd else '', exc_str(e)))
+                if isinstance(e, FileNotFoundError) and expect_fail:
+                    logfn = lgr.debug
+                else:
+                    logfn = lgr.error
+                logfn("Failed to start %r%r: %s" %
+                      (cmd, " under %r" % cwd if cwd else '', exc_str(e)))
                 raise
 
             finally:

reproman/support/external_versions.py

@@ -44,27 +44,32 @@ def __cmp__(self, other):
 _runner = Runner()
 
 
+def _try_run(cmd):
+    return _runner.run(cmd, expect_fail=True, expect_stderr=True)
+
+
 def _get_annex_version():
     """Return version of available git-annex"""
-    return _runner.run('git annex version --raw'.split())[0]
+    return _try_run(['git', 'annex', 'version', '--raw'])[0]
 
 
 def _get_git_version():
     """Return version of available git"""
-    return _runner.run('git version'.split())[0].split()[-1]
+    out = _try_run(['git', 'version'])[0]
+    return out.split()[-1]
 
 
 def _get_apt_cache_version():
     """Return version of available apt-cache."""
-    return _runner.run('apt-cache -v'.split())[0].split()[1]
+    out = _try_run(['apt-cache', '-v'])[0]
+    return out.split()[1]
 
 
 def _get_system_ssh_version():
     """Return version of ssh available system-wide
     """
     try:
-        out, err = _runner.run('ssh -V'.split(),
-                               expect_fail=True, expect_stderr=True)
+        out, err = _try_run(['ssh', '-V'])
         # apparently spits out to err but I wouldn't trust it blindly
         if err.startswith('OpenSSH'):
             out = err
@@ -80,7 +85,7 @@ def _get_singularity_version():
     # example output:
     #  "singularity version 3.0.3+ds"
     #  "2.6.1-dist"
-    out = _runner.run(["singularity", "--version"])[0]
+    out = _try_run(["singularity", "--version"])[0]
     return out.split(' ')[-1].split("-")[0].split("+")[0]
 
 
@@ -90,15 +95,17 @@ def _get_svn_version():
     #
     # svn, version 1.9.5 (r1770682)
     # [...]
-    return _runner.run(["svn", "--version"])[0].split()[2]
+    out = _try_run(["svn", "--version"])[0]
+    return out.split()[2]
 
 
 def _get_condor_version():
     """Return version of available condor"""
     # Example output:
     #
     # $CondorVersion: 8.6.8 Nov 30 2017 BuildID: [...]
-    return _runner.run(['condor_version'])[0].split()[1]
+    out = _try_run(['condor_version'])[0]
+    return out.split()[1]
 
 
 class ExternalVersions(object):

reproman/tests/skip.py

@@ -68,8 +68,9 @@ def no_aws_dependencies():
 def no_condor():
     def is_running():
         try:
-            Runner().run(["condor_status"])
-        except CommandError as exc:
+            Runner().run(["condor_status"],
+                         expect_fail=True, expect_stderr=True)
+        except (CommandError, FileNotFoundError):
             return False
         return True
 
@@ -118,8 +119,9 @@ def is_running():
         # Does it look like tools/ci/setup-slurm-container.sh was called?
         try:
             out, _ = Runner().run(
-                ["docker", "port", "reproman-slurm-container"])
-        except CommandError:
+                ["docker", "port", "reproman-slurm-container"],
+                expect_fail=True, expect_stderr=True)
+        except (CommandError, FileNotFoundError):
             return False
         return out.strip()
     return "slurm container is not running", not is_running()