You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2022/09/15 13:46:37 UTC
[allura] 02/05: [#8455] allura pytest - fix misc test failures that popped up during pytest conversion
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8455
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 132365a7ea5dbab0e3e3abb93c3e5b5cd5fdd633
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Mon Sep 12 20:00:41 2022 +0000
[#8455] allura pytest - fix misc test failures that popped up during pytest conversion
---
Allura/allura/tests/model/test_auth.py | 2 +-
Allura/allura/tests/test_globals.py | 90 +++++++++++++++++-----------------
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Allura/allura/tests/model/test_auth.py b/Allura/allura/tests/model/test_auth.py
index 2d6aa75f7..7f48c49bc 100644
--- a/Allura/allura/tests/model/test_auth.py
+++ b/Allura/allura/tests/model/test_auth.py
@@ -352,8 +352,8 @@ def test_check_sent_user_message_times():
assert not user1.can_send_user_message()
-@td.with_user_project('test-admin')
@with_setup(setup_method)
+@td.with_user_project('test-admin')
def test_user_track_active():
# without this session flushing inside track_active raises Exception
setup_functional_test()
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 4d4b3b592..172c1c57b 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -18,6 +18,7 @@
import re
import os
+from textwrap import dedent
import allura
import unittest
import hashlib
@@ -358,17 +359,19 @@ class Test():
def test_markdown_toc(self):
with h.push_context('test', neighborhood='Projects'):
- r = g.markdown_wiki.convert("""[TOC]
+ r = g.markdown_wiki.convert(dedent("""\
+ [TOC]
- # Header 1
+ # Header 1
- ## Header 2""")
- assert '''<ul>
- <li><a href="#header-1">Header 1</a><ul>
- <li><a href="#header-2">Header 2</a></li>
- </ul>
- </li>
- </ul>''' in r, r
+ ## Header 2"""))
+ assert dedent('''\
+ <ul>
+ <li><a href="#header-1">Header 1</a><ul>
+ <li><a href="#header-2">Header 2</a></li>
+ </ul>
+ </li>
+ </ul>''') in r
@td.with_wiki
def test_wiki_artifact_links(self):
@@ -442,38 +445,35 @@ class Test():
'<p>Line</p></div>')
# should not raise an exception:
- assert (
- g.markdown.convert("<class 'foo'>") ==
- '''<div class="markdown_content"><p><class 'foo'=""></class></p></div>''')
-
- assert (
- g.markdown.convert('''# Header
-
- Some text in a regular paragraph
-
- :::python
- for i in range(10):
- print i
- ''') ==
- # no <br
- '<div class="markdown_content"><h1 id="header">Header</h1>\n'
- '<p>Some text in a regular paragraph</p>\n'
- '<div class="codehilite"><pre><span></span><code><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">10</span><span class="p">):</span>\n'
- ' <span class="nb">print</span> <span class="n">i</span>\n'
- '</code></pre></div>\n'
- '</div>')
+ assert g.markdown.convert("<class 'foo'>") == \
+ '''<div class="markdown_content"><p><class 'foo'=""></class></p></div>'''
+
+ assert g.markdown.convert(dedent('''\
+ # Header
+
+ Some text in a regular paragraph
+
+ :::python
+ for i in range(10):
+ print i
+ ''')) == dedent('''\
+ <div class="markdown_content"><h1 id="header">Header</h1>
+ <p>Some text in a regular paragraph</p>
+ <div class="codehilite"><pre><span></span><code><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">10</span><span class="p">):</span>
+ <span class="nb">print</span> <span class="n">i</span>
+ </code></pre></div>
+ </div>''')
assert (
g.forge_markdown(email=True).convert('[Home]') ==
# uses localhost:
'<div class="markdown_content"><p><a class="alink" href="http://localhost/p/test/wiki/Home/">[Home]</a></p></div>')
- assert (
- g.markdown.convert('''
- ~~~~
- def foo(): pass
- ~~~~''') ==
- '<div class="markdown_content"><div class="codehilite"><pre><span></span><code>def foo(): pass\n'
- '</code></pre></div>\n'
- '</div>')
+ assert g.markdown.convert(dedent('''\
+ ~~~~
+ def foo(): pass
+ ~~~~''')) == dedent('''\
+ <div class="markdown_content"><div class="codehilite"><pre><span></span><code>def foo(): pass
+ </code></pre></div>
+ </div>''')
def test_markdown_list_without_break(self):
# this is not a valid way to make a list in original Markdown or python-markdown
@@ -482,37 +482,37 @@ class Test():
# TODO: try https://github.com/adamb70/mdx-breakless-lists
# or https://gitlab.com/ayblaq/prependnewline
assert (
- g.markdown.convert('''\
+ g.markdown.convert(dedent('''\
Regular text
* first item
- * second item''') ==
+ * second item''')) ==
'<div class="markdown_content"><p>Regular text\n' # no <br>
'* first item\n' # no <br>
'* second item</p></div>')
assert (
- g.markdown.convert('''\
+ g.markdown.convert(dedent('''\
Regular text
- first item
- - second item''') ==
+ - second item''')) ==
'<div class="markdown_content"><p>Regular text<br/>\n'
'- first item<br/>\n'
'- second item</p></div>')
assert (
- g.markdown.convert('''\
+ g.markdown.convert(dedent('''\
Regular text
+ first item
- + second item''') ==
+ + second item''')) ==
'<div class="markdown_content"><p>Regular text<br/>\n'
'+ first item<br/>\n'
'+ second item</p></div>')
assert (
- g.markdown.convert('''\
+ g.markdown.convert(dedent('''\
Regular text
1. first item
- 2. second item''') ==
+ 2. second item''')) ==
'<div class="markdown_content"><p>Regular text<br/>\n'
'1. first item<br/>\n'
'2. second item</p></div>')