From 114ca22d4a00763952e5143e2a0d9186ed6fcfcc Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 31 2017 09:42:33 +0000
Subject: Make tests handle wait pages


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/tests/__init__.py b/tests/__init__.py
index 3b45dcb..0e5614b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -17,6 +17,8 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import time
+import re
 import os
 logging.basicConfig(stream=sys.stderr)
 
@@ -82,6 +84,36 @@ if os.environ.get('BUILD_ID')or os.environ.get('FAITOUT_URL'):
         LOG.info('Error while querying faitout: %s', err)
         pass
 
+
+WAIT_REGEX = re.compile("""window\.location = '(\/wait\/[a-z0-9-]+\?.*)'""")
+def get_wait_target(html):
+    """ This parses the window.location out of the HTML for the wait page. """
+    found = WAIT_REGEX.findall(html)
+    if len(found) != 1:
+        raise Exception("Not able to get wait target in %s" % html)
+    return found[0]
+
+
+def create_maybe_waiter(method, getter):
+    def maybe_waiter(*args, **kwargs):
+        """ A wrapper for self.app.get()/.post() that will resolve wait's """
+        result = method(*args, **kwargs)
+        count = 0
+        while 'We are waiting for your task to finish.' in result.data:
+            # Resolve wait page
+            target_url = get_wait_target(result.data)
+            if count > 10:
+                time.sleep(0.5)
+            else:
+                time.sleep(0.1)
+            result = getter(target_url, follow_redirects=True)
+            if count > 50:
+                raise Exception('Had to wait too long')
+        else:
+            return result
+    return maybe_waiter
+
+
 # Remove the log handlers for the tests
 pagure.APP.logger.handlers = []
 
@@ -250,6 +282,8 @@ class Modeltests(unittest.TestCase):
         pagure.APP.config['ATTACHMENTS_FOLDER'] = os.path.join(
             self.path, 'attachments')
         self.app = pagure.APP.test_client()
+        self.app.get = create_maybe_waiter(self.app.get, self.app.get)
+        self.app.post = create_maybe_waiter(self.app.post, self.app.get)
 
     def tearDown(self):     # pylint: disable=invalid-name
         """ Remove the test.db database if there is one. """
diff --git a/tests/test_pagure_flask_api.py b/tests/test_pagure_flask_api.py
index 56153a0..fbee2a2 100644
--- a/tests/test_pagure_flask_api.py
+++ b/tests/test_pagure_flask_api.py
@@ -36,7 +36,6 @@ class PagureFlaskApitests(tests.Modeltests):
         pagure.APP.config['TESTING'] = True
         pagure.SESSION = self.session
         pagure.api.SESSION = self.session
-        self.app = pagure.APP.test_client()
 
     def test_api_version(self):
         """ Test the api_version function.  """
diff --git a/tests/test_pagure_flask_api_auth.py b/tests/test_pagure_flask_api_auth.py
index d21c20f..afdd070 100644
--- a/tests/test_pagure_flask_api_auth.py
+++ b/tests/test_pagure_flask_api_auth.py
@@ -39,7 +39,6 @@ class PagureFlaskApiAuthtests(tests.Modeltests):
         pagure.api.SESSION = self.session
         pagure.api.issue.SESSION = self.session
         pagure.lib.SESSION = self.session
-        self.app = pagure.APP.test_client()
 
     def test_auth_no_data(self):
         """ Test the authentication when there is nothing in the database.
diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py
index dfcb704..47b1719 100644
--- a/tests/test_pagure_flask_api_fork.py
+++ b/tests/test_pagure_flask_api_fork.py
@@ -43,7 +43,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         pagure.APP.config['REQUESTS_FOLDER'] = None
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.notify.send_email')
     def test_api_pull_request_views(self, send_email):
diff --git a/tests/test_pagure_flask_api_group.py b/tests/test_pagure_flask_api_group.py
index f92f73f..42665e4 100644
--- a/tests/test_pagure_flask_api_group.py
+++ b/tests/test_pagure_flask_api_group.py
@@ -50,7 +50,6 @@ class PagureFlaskApiGroupTests(tests.Modeltests):
         )
         self.session.commit()
 
-        self.app = pagure.APP.test_client()
 
     def test_api_groups(self):
         """ Test the api_groups function.  """
diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index e029bb3..2caa287 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -298,7 +298,6 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
 
         pagure.APP.config['TICKETS_FOLDER'] = None
 
-        self.app = pagure.APP.test_client()
 
     def test_api_new_issue(self):
         """ Test the api_new_issue method of the flask api. """
diff --git a/tests/test_pagure_flask_api_issue_change_status.py b/tests/test_pagure_flask_api_issue_change_status.py
index 43265f9..6db1112 100644
--- a/tests/test_pagure_flask_api_issue_change_status.py
+++ b/tests/test_pagure_flask_api_issue_change_status.py
@@ -48,7 +48,6 @@ class PagureFlaskApiIssueChangeStatustests(tests.Modeltests):
 
         pagure.APP.config['TICKETS_FOLDER'] = None
 
-        self.app = pagure.APP.test_client()
 
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(self.path, 'tickets'))
diff --git a/tests/test_pagure_flask_api_issue_comment.py b/tests/test_pagure_flask_api_issue_comment.py
index 123812c..cc923b6 100644
--- a/tests/test_pagure_flask_api_issue_comment.py
+++ b/tests/test_pagure_flask_api_issue_comment.py
@@ -43,7 +43,6 @@ class PagureFlaskApiIssueCommenttests(tests.Modeltests):
 
         pagure.APP.config['TICKETS_FOLDER'] = None
 
-        self.app = pagure.APP.test_client()
 
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(self.path, 'tickets'))
diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py
index 1174580..5ff8624 100644
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -44,7 +44,6 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
         pagure.api.project.SESSION = self.session
         pagure.lib.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_api_git_tags(self):
         """ Test the api_git_tags method of the flask api. """
diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py
index 842b410..1c11a71 100644
--- a/tests/test_pagure_flask_api_ui_private_repo.py
+++ b/tests/test_pagure_flask_api_ui_private_repo.py
@@ -233,7 +233,6 @@ class PagurePrivateRepotest(tests.Modeltests):
         pagure.api.issue.SESSION = self.session
 
         pagure.APP.config['VIRUS_SCAN_ATTACHMENTS'] = False
-        self.app = pagure.APP.test_client()
 
     def set_up_git_repo(
             self, new_project=None, branch_from='feature', mtype='FF'):
diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py
index 36b2e3b..ba487b2 100644
--- a/tests/test_pagure_flask_api_user.py
+++ b/tests/test_pagure_flask_api_user.py
@@ -45,7 +45,6 @@ class PagureFlaskApiUSertests(tests.Modeltests):
 
         pagure.APP.config['REQUESTS_FOLDER'] = None
 
-        self.app = pagure.APP.test_client()
 
     def test_api_users(self):
         """ Test the api_users function.  """
diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py
index 90db374..90077cb 100644
--- a/tests/test_pagure_flask_docs.py
+++ b/tests/test_pagure_flask_docs.py
@@ -53,9 +53,9 @@ class PagureFlaskDocstests(tests.Modeltests):
             self.path, 'tickets')
         pagure.docs_server.APP.config['DOCS_FOLDER'] = os.path.join(
             self.path, 'docs')
-
         self.app = pagure.docs_server.APP.test_client()
 
+
     def _set_up_doc(self):
         # forked doc repo
         docrepo = os.path.join(self.path, 'docs', 'test', 'test.git')
diff --git a/tests/test_pagure_flask_dump_load_ticket.py b/tests/test_pagure_flask_dump_load_ticket.py
index 7391336..3cb0bd1 100644
--- a/tests/test_pagure_flask_dump_load_ticket.py
+++ b/tests/test_pagure_flask_dump_load_ticket.py
@@ -46,7 +46,6 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
         pagure.ui.fork.SESSION = self.session
         pagure.ui.repo.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.notify.send_email')
     @patch('pagure.lib.git._maybe_wait')
@@ -159,7 +158,7 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests):
         self.assertEqual(msg, 'Issue marked as depending on: #1')
 
         # Dump the JSON
-        pagure.lib.git.update_git(issue, repo, repopath)
+        pagure.lib.git.update_git(issue, repo, repopath).wait()
         repo = pygit2.Repository(self.gitrepo)
         cnt = len([commit
             for commit in repo.walk(
diff --git a/tests/test_pagure_flask_form.py b/tests/test_pagure_flask_form.py
index fa23756..2b16546 100644
--- a/tests/test_pagure_flask_form.py
+++ b/tests/test_pagure_flask_form.py
@@ -35,7 +35,6 @@ class PagureFlaskFormTests(tests.Modeltests):
         pagure.APP.config['TESTING'] = True
         pagure.APP.config['SERVER_NAME'] = 'pagure.org'
         pagure.SESSION = self.session
-        self.app = pagure.APP.test_client()
 
     def test_csrf_form_no_input(self):
         """ Test the CSRF validation if not CSRF is specified. """
diff --git a/tests/test_pagure_flask_internal.py b/tests/test_pagure_flask_internal.py
index 487cc2c..1c3f3f4 100644
--- a/tests/test_pagure_flask_internal.py
+++ b/tests/test_pagure_flask_internal.py
@@ -48,7 +48,6 @@ class PagureFlaskInternaltests(tests.Modeltests):
         pagure.APP.config['REQUESTS_FOLDER'] = None
         pagure.APP.config['TICKETS_FOLDER'] = None
         pagure.APP.config['DOCS_FOLDER'] = None
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.notify.send_email')
     def test_pull_request_add_comment(self, send_email):
diff --git a/tests/test_pagure_flask_ui_app.py b/tests/test_pagure_flask_ui_app.py
index e5de177..ef9b95b 100644
--- a/tests/test_pagure_flask_ui_app.py
+++ b/tests/test_pagure_flask_ui_app.py
@@ -43,8 +43,6 @@ class PagureFlaskApptests(tests.Modeltests):
         pagure.ui.filters.SESSION = self.session
         pagure.ui.repo.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
-
     def test_index(self):
         """ Test the index endpoint. """
 
diff --git a/tests/test_pagure_flask_ui_app_give_project.py b/tests/test_pagure_flask_ui_app_give_project.py
index 5121bb9..c3a0416 100644
--- a/tests/test_pagure_flask_ui_app_give_project.py
+++ b/tests/test_pagure_flask_ui_app_give_project.py
@@ -45,7 +45,6 @@ class PagureFlaskGiveRepotests(tests.Modeltests):
         pagure.APP.config['UPLOAD_FOLDER_URL'] = '/releases/'
         pagure.APP.config['UPLOAD_FOLDER_PATH'] = os.path.join(
             self.path, 'releases')
-        self.app = pagure.APP.test_client()
 
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True)
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index 771bf48..94dc1bc 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -66,7 +66,6 @@ class PagureFlaskForktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.issues.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def set_up_git_repo(
             self, new_project=None, branch_from='feature', mtype='FF'):
diff --git a/tests/test_pagure_flask_ui_groups.py b/tests/test_pagure_flask_ui_groups.py
index 2f5cb92..07a51d4 100644
--- a/tests/test_pagure_flask_ui_groups.py
+++ b/tests/test_pagure_flask_ui_groups.py
@@ -41,7 +41,6 @@ class PagureFlaskGroupstests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_group_lists(self):
         """ Test the group_lists endpoint. """
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index c676904..972f28f 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -52,7 +52,6 @@ class PagureFlaskIssuestests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py
index 88bf61d..e0e4457 100644
--- a/tests/test_pagure_flask_ui_issues_acl_checks.py
+++ b/tests/test_pagure_flask_ui_issues_acl_checks.py
@@ -49,7 +49,6 @@ class PagureFlaskIssuesACLtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_login.py b/tests/test_pagure_flask_ui_login.py
index 037745e..5312a0d 100644
--- a/tests/test_pagure_flask_ui_login.py
+++ b/tests/test_pagure_flask_ui_login.py
@@ -51,7 +51,6 @@ class PagureFlaskLogintests(tests.Modeltests):
         pagure.ui.login.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
     def test_new_user(self):
diff --git a/tests/test_pagure_flask_ui_no_master_branch.py b/tests/test_pagure_flask_ui_no_master_branch.py
index 733b33d..9f82fa9 100644
--- a/tests/test_pagure_flask_ui_no_master_branch.py
+++ b/tests/test_pagure_flask_ui_no_master_branch.py
@@ -45,7 +45,6 @@ class PagureFlaskNoMasterBranchtests(tests.Modeltests):
         pagure.ui.fork.SESSION = self.session
         pagure.ui.repo.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def set_up_git_repo(self):
         """ Set up the git repo to play with. """
diff --git a/tests/test_pagure_flask_ui_old_commit.py b/tests/test_pagure_flask_ui_old_commit.py
index c97b75a..d42d80a 100644
--- a/tests/test_pagure_flask_ui_old_commit.py
+++ b/tests/test_pagure_flask_ui_old_commit.py
@@ -48,7 +48,6 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         pagure.APP.config['EMAIL_SEND'] = False
         pagure.APP.config['UPLOAD_FOLDER_PATH'] = os.path.join(
             self.path, 'releases')
-        self.app = pagure.APP.test_client()
 
     def tearDown(self):
         """ Tear down the environnment, after every tests. """
@@ -90,7 +89,6 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
             ' 3 </span><span style="color: #00A000; background-color: ' +
             '#ddffdd">+ ======</span>' in output.data)
 
-        self.app = pagure.APP.test_client()
         # View first commit - with the old URL scheme
         output = self.app.get(
             '/test/%s' % commit.oid.hex, follow_redirects=True)
diff --git a/tests/test_pagure_flask_ui_plugins.py b/tests/test_pagure_flask_ui_plugins.py
index aed76e0..420860b 100644
--- a/tests/test_pagure_flask_ui_plugins.py
+++ b/tests/test_pagure_flask_ui_plugins.py
@@ -55,7 +55,6 @@ class PagureFlaskPluginstests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_get_plugin_names(self):
         """ Test the get_plugin_names function. """
diff --git a/tests/test_pagure_flask_ui_plugins_default_hook.py b/tests/test_pagure_flask_ui_plugins_default_hook.py
index fee7f9b..47c0b41 100644
--- a/tests/test_pagure_flask_ui_plugins_default_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_default_hook.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginDefaultHooktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_default_ui(self):
         """ Test the default hook plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_fedmsg.py b/tests/test_pagure_flask_ui_plugins_fedmsg.py
index 86d7d4a..ad41463 100644
--- a/tests/test_pagure_flask_ui_plugins_fedmsg.py
+++ b/tests/test_pagure_flask_ui_plugins_fedmsg.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginFedmsgtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_fedmsg(self):
         """ Test the fedmsg plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_irc.py b/tests/test_pagure_flask_ui_plugins_irc.py
index 2055a98..ff3f74d 100644
--- a/tests/test_pagure_flask_ui_plugins_irc.py
+++ b/tests/test_pagure_flask_ui_plugins_irc.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginIRCtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_mail(self):
         """ Test the irc plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_mail.py b/tests/test_pagure_flask_ui_plugins_mail.py
index 2607093..6cafe65 100644
--- a/tests/test_pagure_flask_ui_plugins_mail.py
+++ b/tests/test_pagure_flask_ui_plugins_mail.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginMailtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_mail(self):
         """ Test the mail plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_noff.py b/tests/test_pagure_flask_ui_plugins_noff.py
index e185e07..1f90245 100644
--- a/tests/test_pagure_flask_ui_plugins_noff.py
+++ b/tests/test_pagure_flask_ui_plugins_noff.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginNoFFtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_noff(self):
         """ Test the noff plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ci.py b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
index e92605d..aea146d 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ci.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ci.py
@@ -39,7 +39,6 @@ class PagureFlaskPluginPagureCItests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_pagure_ci(self):
         """ Test the pagure ci plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
index 8cd9877..66191c8 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_hook.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginPagureHooktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_mail(self):
         """ Test the pagure hook plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
index 28a639e..742629a 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_request_hook.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginPagureRequestHooktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_pagure_request(self):
         """ Test the pagure_request plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
index 7eb0a75..0f223bf 100644
--- a/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_pagure_ticket_hook.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginPagureTicketHooktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_pagure_ticket(self):
         """ Test the pagure_ticket plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_rtd_hook.py b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
index f54fdd4..03258b2 100644
--- a/tests/test_pagure_flask_ui_plugins_rtd_hook.py
+++ b/tests/test_pagure_flask_ui_plugins_rtd_hook.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginRtdHooktests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_pagure_request(self):
         """ Test the pagure_request plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_plugins_unsigned.py b/tests/test_pagure_flask_ui_plugins_unsigned.py
index a4635d9..9303225 100644
--- a/tests/test_pagure_flask_ui_plugins_unsigned.py
+++ b/tests/test_pagure_flask_ui_plugins_unsigned.py
@@ -42,7 +42,6 @@ class PagureFlaskPluginUnsignedtests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.filters.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def test_plugin_unsigned(self):
         """ Test the noff plugin on/off endpoint. """
diff --git a/tests/test_pagure_flask_ui_priorities.py b/tests/test_pagure_flask_ui_priorities.py
index 278fe4f..762e9a8 100644
--- a/tests/test_pagure_flask_ui_priorities.py
+++ b/tests/test_pagure_flask_ui_priorities.py
@@ -46,7 +46,6 @@ class PagureFlaskPrioritiestests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.issues.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_quick_reply.py b/tests/test_pagure_flask_ui_quick_reply.py
index 737f2ec..9849d6f 100644
--- a/tests/test_pagure_flask_ui_quick_reply.py
+++ b/tests/test_pagure_flask_ui_quick_reply.py
@@ -40,7 +40,6 @@ class PagureFlaskQuickReplytest(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(self.path, 'repos'), bare=True)
 
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index f8581ba..e57548b 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -49,7 +49,6 @@ class PagureFlaskRepotests(tests.Modeltests):
         pagure.APP.config['UPLOAD_FOLDER_URL'] = '/releases/'
         pagure.APP.config['UPLOAD_FOLDER_PATH'] = os.path.join(
             self.path, 'releases')
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.ui.repo.admin_session_timedout')
     def test_add_user_when_user_mngt_off(self, ast):
diff --git a/tests/test_pagure_flask_ui_repo_slash_name.py b/tests/test_pagure_flask_ui_repo_slash_name.py
index eaab42f..9d8c055 100644
--- a/tests/test_pagure_flask_ui_repo_slash_name.py
+++ b/tests/test_pagure_flask_ui_repo_slash_name.py
@@ -46,7 +46,6 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.issues.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def set_up_git_repo(self, name='test'):
         """ Set up the git repo to play with. """
diff --git a/tests/test_pagure_flask_ui_roadmap.py b/tests/test_pagure_flask_ui_roadmap.py
index b94509e..aa1e79f 100644
--- a/tests/test_pagure_flask_ui_roadmap.py
+++ b/tests/test_pagure_flask_ui_roadmap.py
@@ -46,7 +46,6 @@ class PagureFlaskRoadmaptests(tests.Modeltests):
         pagure.ui.repo.SESSION = self.session
         pagure.ui.issues.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
diff --git a/tests/test_pagure_flask_ui_slash_branch_name.py b/tests/test_pagure_flask_ui_slash_branch_name.py
index 3e03303..b8463f9 100644
--- a/tests/test_pagure_flask_ui_slash_branch_name.py
+++ b/tests/test_pagure_flask_ui_slash_branch_name.py
@@ -45,7 +45,6 @@ class PagureFlaskSlashInBranchtests(tests.Modeltests):
         pagure.ui.fork.SESSION = self.session
         pagure.ui.repo.SESSION = self.session
 
-        self.app = pagure.APP.test_client()
 
     def set_up_git_repo(self):
         """ Set up the git repo to play with. """
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 36896aa..2b289f0 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -3946,7 +3946,6 @@ class PagureLibtests(tests.Modeltests):
         pagure.APP.config['SERVER_NAME'] = 'pagure.org'
         pagure.SESSION = self.session
         pagure.lib.SESSION = self.session
-        self.app = pagure.APP.test_client()
 
         # This creates:
         # project: test