Patchwork [1,of,5,STABLE] tests: relax pattern matching for newer docker

login
register
mail settings
Submitter Sean Farley
Date April 16, 2016, 8:36 p.m.
Message ID <599a90378654224ca095.1460838981@laptop.local>
Download mbox | patch
Permalink /patch/14688/
State Accepted
Commit aa927b0a5b8782778c9baa0c2ddc11c34f75523a
Headers show

Comments

Sean Farley - April 16, 2016, 8:36 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1460756852 25200
#      Fri Apr 15 14:47:32 2016 -0700
# Branch stable
# Node ID 599a90378654224ca0954c68e93776d51e605679
# Parent  2d39f987f0bacc39a8319cb6c84b2d38c1991028
# EXP-Topic ppa
tests: relax pattern matching for newer docker

Patch

diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -421,11 +421,11 @@  def has_aix():
 def has_osx():
     return sys.platform == 'darwin'
 
 @check("docker", "docker support")
 def has_docker():
-    pat = r'A self-sufficient runtime for linux containers\.'
+    pat = r'A self-sufficient runtime for'
     if matchoutput('docker --help', pat):
         if 'linux' not in sys.platform:
             # TODO: in theory we should be able to test docker-based
             # package creation on non-linux using boot2docker, but in
             # practice that requires extra coordination to make sure