Merged revisions 71762 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71762 | tarek.ziade | 2009-04-20 14:37:58 +0200 (Mon, 20 Apr 2009) | 9 lines

  Merged revisions 71759 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r71759 | tarek.ziade | 2009-04-20 12:33:47 +0200 (Mon, 20 Apr 2009) | 1 line

    making BuildWinInstTestCase silent in case bdist_wininst is not run under win32
  ........
................

diff --git a/Lib/distutils/tests/test_bdist_wininst.py b/Lib/distutils/tests/test_bdist_wininst.py
index de6601fbb7efb2c4f05ecfc147ee741c3f872fca..85aa02a2861ec8e9798f1c85ac299505ca721867 100644 (file)
--- a/Lib/distutils/tests/test_bdist_wininst.py
+++ b/Lib/distutils/tests/test_bdist_wininst.py
@@ -7,6 +7,7 @@ from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
 class BuildWinInstTestCase(support.TempdirManager,
+                           support.LoggingSilencer,
                            unittest.TestCase):
 
     def test_get_exe_bytes(self):