test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #17908 -- Made some `contrib.markup` tests be skipped so they don't fail on old versions of Markdown. Thanks to Preston Holmes for the patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip 2012-03-16 00:36:52 +00:00
parent a395e531de
commit 49e7f4a229
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/markup/tests.py
View File

@ -12,6 +12,7 @@ except ImportError:
try: try:
import markdown import markdown
markdown_version = getattr(markdown, "version_info", 0)
except ImportError: except ImportError:
markdown = None markdown = None
@ -36,7 +37,6 @@ Paragraph 2 with a link_
.. _link: http://www.example.com/""" .. _link: http://www.example.com/"""
@unittest.skipUnless(textile, 'texttile not installed') @unittest.skipUnless(textile, 'texttile not installed')
def test_textile(self): def test_textile(self):
t = Template("{% load markup %}{{ textile_content|textile }}") t = Template("{% load markup %}{{ textile_content|textile }}")
@ -58,14 +58,14 @@ Paragraph 2 with a link_
pattern = re.compile("""<p>Paragraph 1\s*</p>\s*<h2>\s*An h2</h2>""") pattern = re.compile("""<p>Paragraph 1\s*</p>\s*<h2>\s*An h2</h2>""")
self.assertTrue(pattern.match(rendered)) self.assertTrue(pattern.match(rendered))
@unittest.skipUnless(markdown, 'markdown no installed') @unittest.skipUnless(markdown and markdown_version >= (2,1), 'markdown >= 2.1 not installed')
def test_markdown_attribute_disable(self): def test_markdown_attribute_disable(self):
t = Template("{% load markup %}{{ markdown_content|markdown:'safe' }}") t = Template("{% load markup %}{{ markdown_content|markdown:'safe' }}")
markdown_content = "{@onclick=alert('hi')}some paragraph" markdown_content = "{@onclick=alert('hi')}some paragraph"
rendered = t.render(Context({'markdown_content':markdown_content})).strip() rendered = t.render(Context({'markdown_content':markdown_content})).strip()
self.assertTrue('@' in rendered) self.assertTrue('@' in rendered)
@unittest.skipUnless(markdown, 'markdown no installed') @unittest.skipUnless(markdown and markdown_version >= (2,1), 'markdown >= 2.1 not installed')
def test_markdown_attribute_enable(self): def test_markdown_attribute_enable(self):
t = Template("{% load markup %}{{ markdown_content|markdown }}") t = Template("{% load markup %}{{ markdown_content|markdown }}")
markdown_content = "{@onclick=alert('hi')}some paragraph" markdown_content = "{@onclick=alert('hi')}some paragraph"