From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 14 Mar 2016 17:21:58 +0000 (+0100)
Subject: Fix test_venv on FreeBSD buildbot
X-Git-Tag: v3.6.0a1~477^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87d6e1364c368244a51574ec805eeed8e8ae87a6;p=thirdparty%2FPython%2Fcpython.git

Fix test_venv on FreeBSD buildbot

Ignore pip warning in test_venv.test_with_venv().
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 28b0f6c3e3d2..d2c986e71e25 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -8,6 +8,7 @@ Licensed to the PSF under a contributor agreement.
 import ensurepip
 import os
 import os.path
+import re
 import struct
 import subprocess
 import sys
@@ -394,7 +395,15 @@ class EnsurePipTest(BaseTest):
         # We force everything to text, so unittest gives the detailed diff
         # if we get unexpected results
         err = err.decode("latin-1") # Force to text, prevent decoding errors
-        self.assertEqual(err, "")
+        # Ignore the warning:
+        #   "The directory '$HOME/.cache/pip/http' or its parent directory
+        #    is not owned by the current user and the cache has been disabled.
+        #    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)
+        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
         # future pip versions, this test can likely be relaxed further.