Patchwork [3,of,3] import-checker: backout 40f79b9a2cc8 (issue4129)

login
register
mail settings
Submitter Chris Jerdonek
Date Dec. 23, 2013, 5:34 a.m.
Message ID <4eb00caf08b4a44621fc.1387776885@stonewall.local>
Download mbox | patch
Permalink /patch/3228/
State Accepted
Commit d87ed25733a121165c0a8e1cb13506591f13a199
Headers show

Comments

Chris Jerdonek - Dec. 23, 2013, 5:34 a.m.
# HG changeset patch
# User Chris Jerdonek <chris.jerdonek@gmail.com>
# Date 1387776420 28800
#      Sun Dec 22 21:27:00 2013 -0800
# Node ID 4eb00caf08b4a44621fceb27a40db59e89d0b91a
# Parent  119d2d689169c700ccd2a84173b02ed510425893
import-checker: backout 40f79b9a2cc8 (issue4129)

This patch backs out 40f79b9a2cc8, which caused test-module-imports.t to
be skipped when the test was run using virtualenv.  Since the test now
passes when using virtualenv, the skip is no longer necessary.

Patch

diff --git a/tests/test-module-imports.t b/tests/test-module-imports.t
--- a/tests/test-module-imports.t
+++ b/tests/test-module-imports.t
@@ -2,13 +2,6 @@ 
 this test on anything earlier.
   $ python -c 'import sys ; assert sys.version_info >= (2, 6)' || exit 80
 
-Virtualenv has a habit of leaving BaseHTTPServer and other modules in
-a place where the import checker is confused about their nature as
-part of the stdlib. Skip the test if BaseHTTPServer's path isn't a
-subpath of sys.prefix.
-
-  $ python -c 'import sys, BaseHTTPServer; assert BaseHTTPServer.__file__.startswith(sys.prefix)' || exit 80
-
   $ import_checker="$TESTDIR"/../contrib/import-checker.py
 Run the doctests from the import checker, and make sure
 it's working correctly.