diff tests/hghave.py @ 38239:ead71b15efd5

merge with stable
author Augie Fackler <augie@google.com>
date Wed, 06 Jun 2018 13:31:24 -0400
parents a6347ae6168d 6fb76897e066
children b93dc48e74ad
line wrap: on
line diff
--- a/tests/hghave.py	Sat May 26 03:01:14 2018 +0530
+++ b/tests/hghave.py	Wed Jun 06 13:31:24 2018 -0400
@@ -98,8 +98,8 @@
         if e.errno != errno.ENOENT:
             raise
         ret = -1
-    ret = p.wait()
-    s = p.stdout.read()
+    s = p.communicate()[0]
+    ret = p.returncode
     return (ignorestatus or not ret) and r.search(s)
 
 @check("baz", "GNU Arch baz client")