From ee7be10b900fffff1cb8d07ffd8eb7ec05fba089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rajmund=20Hru=C5=A1ka?= <rajmund.hruska@cesnet.cz>
Date: Mon, 25 Jul 2022 13:39:42 +0200
Subject: [PATCH] Fix: Fix skipped and broken unit tests. (Redmine issue:
#7494)
---
lib/hawat/blueprints/auth/test/__init__.py | 3 ---
lib/hawat/blueprints/auth_api/test/__init__.py | 5 -----
lib/hawat/blueprints/auth_env/test/__init__.py | 5 -----
lib/hawat/blueprints/changelogs/test/__init__.py | 4 ----
lib/hawat/blueprints/devtools/test/__init__.py | 16 ++++++++++++----
lib/hawat/blueprints/hosts/__init__.py | 2 +-
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/lib/hawat/blueprints/auth/test/__init__.py b/lib/hawat/blueprints/auth/test/__init__.py
index d1ca73f64..639b58e31 100644
--- a/lib/hawat/blueprints/auth/test/__init__.py
+++ b/lib/hawat/blueprints/auth/test/__init__.py
@@ -21,10 +21,7 @@ import unittest
from hawat.test import HawatTestCase
from hawat.test.runner import TestRunnerMixin
-_IS_NOSE = sys.argv[0].endswith('nosetests')
-
-@unittest.skipIf(_IS_NOSE, "broken under nosetest")
class AuthTestCase(TestRunnerMixin, HawatTestCase):
"""
Class for testing :py:mod:`hawat.blueprints.auth` blueprint.
diff --git a/lib/hawat/blueprints/auth_api/test/__init__.py b/lib/hawat/blueprints/auth_api/test/__init__.py
index 2dd9bebfb..35961e109 100644
--- a/lib/hawat/blueprints/auth_api/test/__init__.py
+++ b/lib/hawat/blueprints/auth_api/test/__init__.py
@@ -24,10 +24,7 @@ import hawat.db
from hawat.test import HawatTestCase
from hawat.test.runner import TestRunnerMixin
-_IS_NOSE = sys.argv[0].endswith('nosetests')
-
-@unittest.skipIf(_IS_NOSE, "broken under nosetest")
class AuthAPITestCase(TestRunnerMixin, HawatTestCase):
"""
Class for testing :py:mod:`hawat.blueprints.auth_api` blueprint.
@@ -122,7 +119,6 @@ class AuthAPITestCase(TestRunnerMixin, HawatTestCase):
)
self.assertEqual(response.status_code, 200)
self.assertTrue(b'Welcome!' in response.data)
- self.assertTrue(b'My account' in response.data)
self.assertTrue(b'data-user-name="admin"' in response.data)
for tcase in (
@@ -136,7 +132,6 @@ class AuthAPITestCase(TestRunnerMixin, HawatTestCase):
)
self.assertEqual(response.status_code, 200)
self.assertTrue(b'Welcome!' in response.data)
- self.assertTrue(b'My account' in response.data)
self.assertTrue(b'data-user-name="admin"' in response.data)
@hawat.test.do_as_user_decorator(hawat.const.ROLE_USER)
diff --git a/lib/hawat/blueprints/auth_env/test/__init__.py b/lib/hawat/blueprints/auth_env/test/__init__.py
index ffbea6920..34888e5b5 100644
--- a/lib/hawat/blueprints/auth_env/test/__init__.py
+++ b/lib/hawat/blueprints/auth_env/test/__init__.py
@@ -27,7 +27,6 @@ class AuthEnvTestCase(TestRunnerMixin, RegistrationHawatTestCase):
Class for testing :py:mod:`hawat.blueprints.auth_env` blueprint.
"""
- @unittest.skip("temporarily disabled")
def test_01_login_user(self):
"""
Test login/logout with *auth_env* module - user 'user'.
@@ -48,7 +47,6 @@ class AuthEnvTestCase(TestRunnerMixin, RegistrationHawatTestCase):
self.assertEqual(response.status_code, 200)
self.assertTrue(b'You have been successfully logged out' in response.data)
- @unittest.skip("temporarily disabled")
def test_02_login_developer(self):
"""
Test login/logout with *auth_env* module - user 'developer'.
@@ -69,7 +67,6 @@ class AuthEnvTestCase(TestRunnerMixin, RegistrationHawatTestCase):
self.assertEqual(response.status_code, 200)
self.assertTrue(b'You have been successfully logged out' in response.data)
- @unittest.skip("temporarily disabled")
def test_03_login_admin(self):
"""
Test login/logout with *auth_env* module - user 'admin'.
@@ -90,7 +87,6 @@ class AuthEnvTestCase(TestRunnerMixin, RegistrationHawatTestCase):
self.assertEqual(response.status_code, 200)
self.assertTrue(b'You have been successfully logged out' in response.data)
- @unittest.skip("temporarily disabled")
def test_04_register(self):
"""
Test registration with *auth_env* module - new user 'test'.
@@ -170,7 +166,6 @@ class AuthEnvTestCase(TestRunnerMixin, RegistrationHawatTestCase):
}
)
- @unittest.skip("temporarily disabled")
def test_05_register_fail(self):
"""
Test registration with *auth_env* module - existing user 'user'.
diff --git a/lib/hawat/blueprints/changelogs/test/__init__.py b/lib/hawat/blueprints/changelogs/test/__init__.py
index 5fcb2e3dd..6a58ca51b 100644
--- a/lib/hawat/blueprints/changelogs/test/__init__.py
+++ b/lib/hawat/blueprints/changelogs/test/__init__.py
@@ -25,10 +25,6 @@ from hawat.test import HawatTestCase
from hawat.test.runner import TestRunnerMixin
-_IS_NOSE = sys.argv[0].endswith('nosetests')
-
-
-@unittest.skipIf(_IS_NOSE, "broken under nosetests")
class ChangeLogsSearchTestCase(TestRunnerMixin, HawatTestCase):
"""Class for testing ``changelogs.search`` endpoint."""
diff --git a/lib/hawat/blueprints/devtools/test/__init__.py b/lib/hawat/blueprints/devtools/test/__init__.py
index c35d8f328..a56295055 100644
--- a/lib/hawat/blueprints/devtools/test/__init__.py
+++ b/lib/hawat/blueprints/devtools/test/__init__.py
@@ -20,9 +20,6 @@ from hawat.test import HawatTestCase
from hawat.test.runner import TestRunnerMixin
-_IS_NOSE = sys.argv[0].endswith('nosetests')
-
-@unittest.skipIf(_IS_NOSE, "broken under nosetest")
class ConfigTestCase(TestRunnerMixin, HawatTestCase):
"""
Class for testing ``devtools.config`` endpoint.
@@ -30,6 +27,17 @@ class ConfigTestCase(TestRunnerMixin, HawatTestCase):
This endpoint is for developers only.
"""
+ def _attempt_fail_redirect(self):
+ self.assertGetURL(
+ '/devtools/config',
+ 302,
+ [
+ b'Redirecting...',
+ b'login?next='
+ ],
+ follow_redirects=False
+ )
+
def _attempt_fail(self):
self.assertGetURL(
'/devtools/config',
@@ -51,7 +59,7 @@ class ConfigTestCase(TestRunnerMixin, HawatTestCase):
def test_01_as_anonymous(self):
"""Test access as anonymous user."""
- self._attempt_fail()
+ self._attempt_fail_redirect()
@hawat.test.do_as_user_decorator(hawat.const.ROLE_USER)
def test_02_as_user(self):
diff --git a/lib/hawat/blueprints/hosts/__init__.py b/lib/hawat/blueprints/hosts/__init__.py
index 4be2da083..a25b9346f 100644
--- a/lib/hawat/blueprints/hosts/__init__.py
+++ b/lib/hawat/blueprints/hosts/__init__.py
@@ -49,7 +49,7 @@ class AbstractSearchView(PsycopgMixin, BaseSearchView): # pylint: disable=local
"""
authentication = True
- authorization = [hawat.acl.PERMISSION_DEVELOPER]
+ authorization = [hawat.acl.PERMISSION_POWER]
@classmethod
def get_menu_title(cls, **kwargs):
--
GitLab