From 6fe308727334111de435a4ed5f547cc3a1a7f68d Mon Sep 17 00:00:00 2001
From: Mathieu Leduc-Hamel <mlhamel@mtlpy.org>
Date: Sat, 12 May 2012 15:36:01 -0400
Subject: Only run specific test if docutils is installed

---
 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
index 366314d..c970b90 100644
--- a/distutils2/tests/support.py
+++ b/distutils2/tests/support.py
@@ -46,6 +46,10 @@ try:
     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 @@ __all__ = [
     # 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_py26_min = unittest.skipIf(sys.version_info[:2] < (2, 6),
 
 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
index 80fc278..8bb9ec2 100644
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -12,7 +12,7 @@ from distutils2.metadata import Metadata, PKG_INFO_PREFERRED_VERSION
 
 from distutils2.tests import unittest
 from distutils2.tests.support import (LoggingCatcher, TempdirManager,
-                                      EnvironRestorer)
+                                      EnvironRestorer, requires_docutils)
 
 
 class MetadataTestCase(LoggingCatcher,
@@ -379,6 +379,7 @@ class MetadataTestCase(LoggingCatcher,
         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()
-- 
cgit v1.2.1