[Python-checkins] distutils2 (merge default -> python3): Merge from default

[eric.araujo]

http://hg.python.org/distutils2/rev/0291648eb2b2
changeset:   1351:0291648eb2b2
branch:      python3
parent:      1349:1eff97fce288
parent:      1350:747eec42e7ae
user:        Éric Araujo <merwok at netwok.org>
date:        Mon May 21 17:03:13 2012 -0400
summary:
  Merge from default

files:
  distutils2/tests/test_command_check.py |  3 +--
  distutils2/tests/test_pypi_wrapper.py  |  2 +-
  distutils2/tests/test_run.py           |  1 +
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/distutils2/tests/test_command_check.py b/distutils2/tests/test_command_check.py
--- a/distutils2/tests/test_command_check.py
+++ b/distutils2/tests/test_command_check.py
@@ -1,7 +1,6 @@
 """Tests for distutils.command.check."""
 
 from distutils2.command.check import check
-from distutils2.metadata import _HAS_DOCUTILS
 from distutils2.errors import PackagingSetupError, MetadataMissingError
 from distutils2.tests import unittest, support
 
@@ -101,7 +100,7 @@
         self._run(metadata, strict=True)
         self.assertEqual(self.get_logs(), [])
 
-    @unittest.skipUnless(_HAS_DOCUTILS, "requires docutils")
+    @support.requires_docutils
     def test_check_restructuredtext(self):
         # let's see if it detects broken rest in description
         broken_rest = 'title\n===\n\ntest'
diff --git a/distutils2/tests/test_pypi_wrapper.py b/distutils2/tests/test_pypi_wrapper.py
--- a/distutils2/tests/test_pypi_wrapper.py
+++ b/distutils2/tests/test_pypi_wrapper.py
@@ -23,7 +23,7 @@
 
     def test_wrapper(self):
         index = Indexes._indexes['one']
-        func = switch_index_if_fails(getattr(index, 'test'), Indexes)
+        func = switch_index_if_fails(index.test, Indexes)
         self.assertEqual(func(), 'OK')
 
 
diff --git a/distutils2/tests/test_run.py b/distutils2/tests/test_run.py
--- a/distutils2/tests/test_run.py
+++ b/distutils2/tests/test_run.py
@@ -151,6 +151,7 @@
         self.write_file('setup.cfg', setupcfg)
 
         out, err = self.call_pysetup('run', 'custom')
+        self.assertEqual(err.splitlines(), [b'running custom'])
         self.assertEqual(out.splitlines(), [b'custom: ok'])
 
 

-- 
Repository URL: http://hg.python.org/distutils2