From: David Ascher <david.ascher@gmail.com>
Date: Fri, 26 Mar 2004 15:10:25 +0000 (+0000)
Subject: Fix test failure for test_tcl on OS/X and Windows if a
X-Git-Tag: v2.4a1~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c5701d36ce4185f2a7dec408d1dc75abb87bca6;p=python

Fix test failure for test_tcl on OS/X and Windows if a
version of Tcl other than ActiveTcl is installed (ActiveTcl
included TclX, other Tcl distros didn't).

I'm removing the package loading test because it's hard to
come up with a package that is guaranteed to be in any Tcl installation.

Special-casing darwin and windows is ok since that leaves the
only Tk platform (X) which the test was trying to address.
---

diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index f13550fae2..321723cdba 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -111,12 +111,6 @@ class TclTest(unittest.TestCase):
             pass
         self.assertRaises(TclError,tcl.evalfile,filename)
 
-    def testPackageRequire(self):
-        tcl = self.interp
-        tcl.eval('package require Tclx')
-        tcl.eval('keylset a b.c 1')
-        self.assertEqual(tcl.eval('keylget a b.c'),'1')
-
     def testPackageRequireException(self):
         tcl = self.interp
         self.assertRaises(TclError,tcl.eval,'package require DNE')
@@ -135,7 +129,7 @@ class TclTest(unittest.TestCase):
         import os
         old_display = None
         import sys
-        if sys.platform.startswith('win'):
+        if sys.platform.startswith('win') or sys.platform.startswith('darwin'):
             return # no failure possible on windows?
         if 'DISPLAY' in os.environ:
             old_display = os.environ['DISPLAY']