Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: virtualenv is only used on py2, rename and conditionalize
authorKyle Lippincott <spectral@google.com>
Fri, 24 Jul 2020 12:13:10 -0700
changeset 45216 357d8415aa27
parent 45215 a253ded5b03d
child 45217 4e5da64d5549
tests: virtualenv is only used on py2, rename and conditionalize 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. Differential Revision: https://phab.mercurial-scm.org/D8812
tests/hghave.py file | annotate | diff | comparison | revisions
tests/test-install.t file | annotate | diff | comparison | revisions 
--- a/tests/hghave.py	Thu Jul 23 13:31:45 2020 -0700
+++ b/tests/hghave.py	Fri Jul 24 12:13:10 2020 -0700
@@ -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
 
--- a/tests/test-install.t	Thu Jul 23 13:31:45 2020 -0700
+++ b/tests/test-install.t	Fri Jul 24 12:13:10 2020 -0700
@@ -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
mercurial