[Python-checkins] distutils2: Only run specific test if docutils is installed

Wed May 16 07:07:26 CEST 2012

http://hg.python.org/distutils2/rev/bb9ca80afc84
changeset: 1326:bb9ca80afc84
user: Mathieu Leduc-Hamel <mlhamel at mtlpy.org>
date: Sat May 12 15:36:01 2012 -0400
summary:
 Only run specific test if docutils is installed
files:
 distutils2/tests/support.py | 8 +++++++-
 distutils2/tests/test_metadata.py | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/distutils2/tests/support.py b/distutils2/tests/support.py
--- a/distutils2/tests/support.py
+++ b/distutils2/tests/support.py
@@ -46,6 +46,10 @@
 import zlib
 except ImportError:
 zlib = None
+try:
+ import docutils
+except ImportError:
+ docutils = None
 
 from distutils2.dist import Distribution
 from distutils2.util import resolve_name
@@ -63,7 +67,7 @@
 # misc. functions and decorators
 'fake_dec', 'create_distribution', 'use_command',
 'copy_xxmodule_c', 'fixup_build_ext',
- 'requires_py26_min', 'skip_2to3_optimize',
+ 'requires_py26_min', 'skip_2to3_optimize', 'requires_docutils',
 # imported from this module for backport purposes
 'unittest', 'requires_zlib', 'skip_unless_symlink',
 ]
@@ -411,6 +415,8 @@
 
 requires_zlib = unittest.skipUnless(zlib, 'requires zlib')
 
+requires_docutils = unittest.skipUnless(docutils, 'requires docutils')
+
 
 def unlink(filename):
 try:
diff --git a/distutils2/tests/test_metadata.py b/distutils2/tests/test_metadata.py
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -12,7 +12,7 @@
 
 from distutils2.tests import unittest
 from distutils2.tests.support import (LoggingCatcher, TempdirManager,
- EnvironRestorer)
+ EnvironRestorer, requires_docutils)
 
 
 class MetadataTestCase(LoggingCatcher,
@@ -379,6 +379,7 @@
 folded_desc = desc.replace('\n', '\n' + (7 * ' ') + '|')
 self.assertIn(folded_desc, out.getvalue())
 
+ @requires_docutils
 def test_description_invalid_rst(self):
 # make sure bad rst is well handled in the description attribute
 metadata = Metadata()
-- 
Repository URL: http://hg.python.org/distutils2
