From: Steve Dower <steve.dower@python.org>
Date: Fri, 26 Jul 2019 16:06:04 +0000 (-0700)
Subject: bpo-37664: Update regex for ignoring cache warning on some buildbots (GH-14960)
X-Git-Tag: v3.9.0a1~970
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1eb20e68e30c8ab128f9d63d622f0a8b49dcf34;p=thirdparty%2FPython%2Fcpython.git

bpo-37664: Update regex for ignoring cache warning on some buildbots (GH-14960)
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index ea016b59ae2b..228aa8d68ed7 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -473,8 +473,9 @@ class EnsurePipTest(BaseTest):
         #    Please check the permissions and owner of that directory. If
         #    executing pip with sudo, you may want sudo's -H flag."
         # where $HOME is replaced by the HOME environment variable.
-        err = re.sub("^The directory .* or its parent directory is not owned "
-                     "by the current user .*$", "", err, flags=re.MULTILINE)
+        err = re.sub("^(WARNING: )?The directory .* or its parent directory "
+                     "is not owned by the current user .*$", "",
+                     err, flags=re.MULTILINE)
         self.assertEqual(err.rstrip(), "")
         # Being fairly specific regarding the expected behaviour for the
         # initial bundling phase in Python 3.4. If the output changes in