Workaround differences in the GHA Ubuntu 18.04 environment compared to the Travis CI Ubuntu 16.04 environment.

This commit is contained in:
Ximon Eighteen
2022-01-25 00:37:01 +01:00
committed by Lorenzo Bolla
parent beb9d43f4d
commit 8e309b57b3
2 changed files with 3 additions and 3 deletions

View File

@@ -89,7 +89,7 @@ class DotFinder(object):
def find_dot(self, executables):
for executable in executables:
try:
subprocess.check_output([executable])
subprocess.check_output([executable, "-V"])
return executable
except Exception:
pass

View File

@@ -131,11 +131,11 @@ if __name__ == "__main__":
except BaseException, e:
print "Failed to capture current version: ", e
output = subprocess.check_output(['gpg', '--version'])
output = subprocess.check_output(['gpg1', '--version'])
if not output.startswith('gpg (GnuPG) 1'):
raise RuntimeError('Tests require gpg v1')
output = subprocess.check_output(['gpgv', '--version'])
output = subprocess.check_output(['gpgv1', '--version'])
if not output.startswith('gpgv (GnuPG) 1'):
raise RuntimeError('Tests require gpgv v1')