Merge default

1 files changed, 18 insertions, 8 deletions

diff --git a/distutils2/tests/test_command_register.py b/distutils2/tests/test_command_register.py
index 4e6c1de..034f4d1 100644
--- a/distutils2/tests/test_command_register.py
+++ b/distutils2/tests/test_command_register.py
@@ -5,14 +5,8 @@ import urllib.request
 import urllib.error
 import urllib.parse
 
-try:
-    import docutils
-    DOCUTILS_SUPPORT = True
-except ImportError:
-    DOCUTILS_SUPPORT = False
-
 from distutils2.tests import unittest, support
-from distutils2.tests.support import Inputs
+from distutils2.tests.support import Inputs, requires_docutils
 from distutils2.command import register as register_module
 from distutils2.command.register import register
 from distutils2.errors import PackagingSetupError
@@ -187,7 +181,7 @@ class RegisterTestCase(support.TempdirManager,
         self.assertEqual(headers['Content-length'], '298')
         self.assertIn(b'tarek', req.data)
 
-    @unittest.skipUnless(DOCUTILS_SUPPORT, 'needs docutils')
+    @requires_docutils
     def test_strict(self):
         # testing the strict option: when on, the register command stops if the
         # metadata is incomplete or if description contains bad reST
@@ -252,6 +246,22 @@ class RegisterTestCase(support.TempdirManager,
         self.assertEqual(data['metadata_version'], '1.2')
         self.assertEqual(data['requires_dist'], ['lxml'])
 
+    @requires_docutils
+    def test_register_invalid_long_description(self):
+        description = ':funkie:`str`'  # mimic Sphinx-specific markup
+        metadata = {'Home-page': 'xxx', 'Author': 'xxx',
+                    'Author-email': 'xxx',
+                    'Name': 'xxx', 'Version': 'xxx',
+                    'Description': description}
+        cmd = self._get_cmd(metadata)
+        cmd.ensure_finalized()
+        cmd.strict = True
+        inputs = Inputs('2', 'tarek', 'tarek@ziade.org')
+        register_module.input = inputs
+        with self.assertRaises(PackagingSetupError) as e:
+            cmd.run()
+        self.assertIn('funkie', str(e.exception))
+
 
 def test_suite():
     return unittest.makeSuite(RegisterTestCase)