]> granicus.if.org Git - python/commitdiff
bpo-37664: Update regex for ignoring cache warning on some buildbots (GH-14960)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 26 Jul 2019 16:24:43 +0000 (09:24 -0700)
committerGitHub <noreply@github.com>
Fri, 26 Jul 2019 16:24:43 +0000 (09:24 -0700)
(cherry picked from commit b1eb20e68e30c8ab128f9d63d622f0a8b49dcf34)

Co-authored-by: Steve Dower <steve.dower@python.org>
Lib/test/test_venv.py

index 6aafa1b14c28621bcfdd18328fb8edb5715c437f..e7adbeebe9600f0382b22e654e4f056205c1cdf0 100644 (file)
@@ -451,8 +451,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