Merged revisions 70920,70922 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70920 | tarek.ziade | 2009-03-31 17:44:10 -0500 (Tue, 31 Mar 2009) | 1 line
catching msvc9compiler error as well
........
r70922 | tarek.ziade | 2009-03-31 17:47:01 -0500 (Tue, 31 Mar 2009) | 1 line
fixed the test for win32 CompileError
........
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 094f4b6..5ea67be 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -11,6 +11,7 @@
from distutils.tests.support import LoggingSilencer
from distutils.extension import Extension
from distutils.errors import UnknownFileError
+from distutils.errors import CompileError
import unittest
from test import support
@@ -154,7 +155,8 @@
dist = Distribution({'name': 'xx', 'ext_modules': modules})
cmd = build_ext(dist)
cmd.ensure_finalized()
- self.assertRaises(UnknownFileError, cmd.run) # should raise an error
+ self.assertRaises((UnknownFileError, CompileError),
+ cmd.run) # should raise an error
modules = [Extension('foo', ['xxx'], optional=True)]
dist = Distribution({'name': 'xx', 'ext_modules': modules})