Use subprocess.check_output() instead of Popen().communicate()

1 files changed, 2 insertions, 6 deletions

diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/72 build always/version_gen.py
index e5a0c2c..17e613e 100755
--- a/test cases/common/72 build always/version_gen.py
+++ b/test cases/common/72 build always/version_gen.py
@@ -6,14 +6,10 @@ def generate(infile, outfile, fallback):
     workdir = os.path.split(infile)[0]
     if workdir == '':
         workdir = '.'
-    version = fallback
     try:
-        p = subprocess.Popen(['git', 'describe'], cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        (stdo, _) = p.communicate()
-        if p.returncode == 0:
-            version = stdo.decode().strip()
+        version = subprocess.check_output(['git', 'describe'], cwd=workdir).decode().strip()
     except Exception:
-        pass
+        version = fallback
     with open(infile) as f:
         newdata = f.read().replace('@VERSION@', version)
     try: