[Zope-Checkins] CVS: Zope - test.py:1.2.2.17

[Stefan H. Holek]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv7262

Modified Files:
      Tag: Zope-2_7-branch
	test.py 
Log Message:
Restored test.py to the version shipping with Zope 2.7.3.

While Florent's use-case is valid the current implementation is not, and we
want to avoid releasing a (slightly but still) b0rked test runner.


=== Zope/test.py 1.2.2.16 => 1.2.2.17 ===
--- Zope/test.py:1.2.2.16	Fri Nov 19 08:48:59 2004
+++ Zope/test.py	Wed Jan 12 08:08:13 2005
@@ -376,16 +376,14 @@
         dir, file = os.path.split(self.home)
         if file == 'bin': self.home = dir
         sys.path.insert(0, os.path.join(self.home, self.libdir))
-        sys.path.insert(0, os.path.join(self.home, self.libdir, 'third_party', 'docutils'))
         self.cwd = os.path.realpath(os.getcwd())
         # Hack again for external products.
         if libdir:
-            self.libdir = os.path.join(self.cwd, libdir)
+            self.libdir = os.path.realpath(os.path.join(self.cwd, libdir))
         else:
-            self.libdir = os.path.join(self.cwd, self.libdir)
-        real_libdir = os.path.realpath(self.libdir)
-        if real_libdir not in sys.path:
-            sys.path.insert(0, real_libdir)
+            self.libdir = os.path.realpath(os.path.join(self.cwd, self.libdir))
+        if self.libdir not in sys.path:
+            sys.path.insert(0, self.libdir)
         # Determine where to look for tests
         if test_dir:
             self.testdir = os.path.abspath(os.path.join(self.cwd, test_dir))