summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-03-31 22:50:54 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-03-31 22:50:54 (GMT)
commit30911294d8f1bfd18206b0ed66b3a986c21b6f78 (patch)
treeab695b61873d4c3b2985fb0f4aff144eac51e31e /Lib/distutils/tests
parent17b9e27abe2148c00f02d9bb1bdff13bc0bed6d0 (diff)
downloadcpython-30911294d8f1bfd18206b0ed66b3a986c21b6f78.zip
cpython-30911294d8f1bfd18206b0ed66b3a986c21b6f78.tar.gz
cpython-30911294d8f1bfd18206b0ed66b3a986c21b6f78.tar.bz2
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 ........
Diffstat (limited to 'Lib/distutils/tests')
-rw-r--r--Lib/distutils/tests/test_build_ext.py4
1 files changed, 3 insertions, 1 deletions
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 TempdirManager
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 @@ class BuildExtTestCase(TempdirManager,
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})