Patchwork D8812: tests: virtualenv is only used on py2, rename and conditionalize

login
register
mail settings
Submitter phabricator
Date July 24, 2020, 10:24 p.m.
Message ID <differential-rev-PHID-DREV-4zeu4xijdalbxnpqp4kc-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46882/
State Superseded
Headers show

Comments

phabricator - July 24, 2020, 10:24 p.m.
spectral created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  If I have I have the Debian `python3-virtualenv` package installed on my
  machine, the import succeeds but then I receive an AttributeError because the
  package is essentially completely different between py2 and py3, and
  test-hghave fails.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8812

AFFECTED FILES
  tests/hghave.py
  tests/test-install.t

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -214,7 +214,7 @@ 
   no problems detected
 #endif
 
-#if no-py3 virtualenv
+#if py2virtualenv
 
 Note: --no-site-packages is deprecated, but some places have an
 ancient virtualenv from their linux distro or similar and it's not yet
diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -886,8 +886,11 @@ 
         return False
 
 
-@check("virtualenv", "Python virtualenv support")
-def has_virtualenv():
+@check("py2virtualenv", "Python2 virtualenv support")
+def has_py2virtualenv():
+    if sys.version_info[0] != 2:
+        return False
+
     try:
         import virtualenv