fixup! fixup! [#8584] added missing validate function to formencode validators

Allura/allura/lib/widgets/forms.py

diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 4ce3fa9..032a7c6 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -118,7 +118,7 @@ def display_field(self, field, ignore_errors=False):
         return display
 
     def validate(self, value, state=None):
-        state = tg.request if hasattr(tg, 'request') else state
+        state = getattr(tg, 'request', None)
         return super().validate(value, state)
 
 

Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py

diff --git a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
index 2b9a01f..8faef96 100644
--- a/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
+++ b/Allura/allura/tests/unit/controllers/test_discussion_moderation_controller.py
@@ -73,7 +73,7 @@ def get_post(self):
 
 
 class TestIndexWithNoPosts(WithDatabase):
-    patches = [patches.fake_app_patch]
+    patches = [patches.fake_app_patch, patches.fake_form_request_patch]
 
     def test_that_it_returns_no_posts(self):
         discussion = create_discussion()
@@ -82,7 +82,7 @@ def test_that_it_returns_no_posts(self):
 
 
 class TestIndexWithAPostInTheDiscussion(WithDatabase):
-    patches = [patches.fake_app_patch]
+    patches = [patches.fake_app_patch, patches.fake_form_request_patch]
 
     def setup_method(self, method):
         super().setup_method(method)

Allura/allura/tests/unit/patches.py

diff --git a/Allura/allura/tests/unit/patches.py b/Allura/allura/tests/unit/patches.py
index 630beec..ddb92ff 100644
--- a/Allura/allura/tests/unit/patches.py
+++ b/Allura/allura/tests/unit/patches.py
@@ -17,6 +17,7 @@
 
 from mock import Mock, patch, MagicMock
 from tg import tmpl_context as c
+import tg
 
 from allura.tests.unit.factories import (
     create_project,
@@ -62,3 +63,5 @@ def fake_request_patch(test_case):
                  MagicMock(
                      referer='.'
                  ))
+def fake_form_request_patch(test_case):
+    return patch('tg.request', MagicMock(referer='.'))