You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2022/08/23 20:41:47 UTC
[allura] 05/05: fixup! fixup! all trivial failures resolved for ./Allura, only legit failures remain
This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a commit to branch kt/8455
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 22249e11aea5f28be9312a15cf4b0c4c5ebdb91d
Author: Kenton Taylor <kt...@slashdotmedia.com>
AuthorDate: Tue Aug 23 20:41:25 2022 +0000
fixup! fixup! all trivial failures resolved for ./Allura, only legit failures remain
---
Allura/allura/tests/test_decorators.py | 4 ++++
Allura/allura/tests/test_globals.py | 5 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/tests/test_decorators.py b/Allura/allura/tests/test_decorators.py
index 5bdf5cf70..033e5c41a 100644
--- a/Allura/allura/tests/test_decorators.py
+++ b/Allura/allura/tests/test_decorators.py
@@ -23,11 +23,15 @@ import gc
from alluratest.tools import assert_equal, assert_not_equal
from allura.tests.pytest_helpers import with_nose_compatibility
from allura.lib.decorators import task, memoize
+from alluratest.controller import setup_basic_test, setup_global_objects
@with_nose_compatibility
class TestTask(TestCase):
+ def setup_method(self, method):
+ setup_basic_test()
+
def test_no_params(self):
@task
def func():
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 24adf6213..dbf1dc16d 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -99,7 +99,7 @@ class Test():
_setup_method()
def teadown_method(self, method):
- self.setup_method(None)
+ _teadown_method()
@td.with_wiki
def test_app_globals(self):
@@ -317,7 +317,7 @@ class Test():
assert squish_spaces(html) == squish_spaces(expected_html)
- @with_setup(setup_method, _teadown_method)
+ @with_setup(_setup_method, _teadown_method)
@td.with_wiki
@td.with_tool('test', 'Wiki', 'wiki2')
def test_macro_include_permissions(self):
@@ -712,7 +712,6 @@ class Test():
assert updated_at == sorted(updated_at, reverse=True)
- @with_setup(setup_functional_test)
def test_filtering(self):
# set up for test
from random import choice