diff options
| author | Mathieu Leduc-Hamel <mlhamel@mtlpy.org> | 2012-05-12 15:36:01 -0400 |
|---|---|---|
| committer | Mathieu Leduc-Hamel <mlhamel@mtlpy.org> | 2012-05-12 15:36:01 -0400 |
| commit | 6fe308727334111de435a4ed5f547cc3a1a7f68d (patch) | |
| tree | 0e2d05fab9af1c4ad8a5f4fb1dc20d5a59118c0e | |
| parent | cd397fbf10519abaf593edc5366a786356286142 (diff) | |
| download | disutils2-6fe308727334111de435a4ed5f547cc3a1a7f68d.tar.gz | |
Only run specific test if docutils is installed
| -rw-r--r-- | distutils2/tests/support.py | 8 | ||||
| -rw-r--r-- | 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() |