Fixed more sonarqube errors

Author: pulk17

tests/api/test_middleware_auth.py

@@ -59,30 +59,30 @@ def test_token_not_found(self):
         self.assertEqual(res.status_code, 401)
 
     def test_wrong_hash(self):
-        plaintext, _ = self.get_token(self.user)
+        plaintext, token = self.get_token(self.user)
         wrong_token = token.token_prefix + 'A' * \
             (len(plaintext) - len(token.token_prefix))
         res = self.client.get('/api/v1/system/queue',
                               headers={'Authorization': f'Bearer {wrong_token}'})
         self.assertEqual(res.status_code, 401)
 
     def test_revoked_token(self):
-        plaintext, _ = self.get_token(self.user)
+        plaintext, token = self.get_token(self.user)
         token.revoke()
         g.db.commit()
         res = self.client.get('/api/v1/system/queue',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 401)
 
     def test_expired_token(self):
-        plaintext, _ = self.get_token(self.user, expires_in_days=-1)
+        plaintext, token = self.get_token(self.user, expires_in_days=-1)
         res = self.client.get('/api/v1/system/queue',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 401)
 
     def test_valid_token_missing_scope(self):
         # /api/v1/system/queue requires 'system:read'
-        plaintext, _ = self.get_token(self.user, scopes=['runs:read'])
+        plaintext, token = self.get_token(self.user, scopes=['runs:read'])
         res = self.client.get('/api/v1/system/queue',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 403)
@@ -91,29 +91,29 @@ def test_valid_token_missing_scope(self):
         self.assertIn('missing_scopes', res.json['details'])
 
     def test_valid_token_with_scope(self):
-        plaintext, _ = self.get_token(self.user, scopes=['system:read'])
+        plaintext, token = self.get_token(self.user, scopes=['system:read'])
         res = self.client.get('/api/v1/system/queue',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 200)
 
     def test_role_decorator_missing_role(self):
         # GET /api/v1/auth/tokens requires 'tokens:manage' and roles ['admin', 'contributor', 'tester']
-        plaintext, _ = self.get_token(
+        plaintext, token = self.get_token(
             self.user, scopes=['tokens:manage'])  # role is user
         res = self.client.get('/api/v1/auth/tokens',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 403)
         self.assertEqual(res.json['code'], 'forbidden')
 
     def test_role_decorator_with_role(self):
-        plaintext, _ = self.get_token(
+        plaintext, token = self.get_token(
             self.admin, scopes=['tokens:manage'])  # role is admin
         res = self.client.get('/api/v1/auth/tokens',
                               headers={'Authorization': f'Bearer {plaintext}'})
         self.assertEqual(res.status_code, 200)
 
     def test_scope_boundary_write_endpoints_fail_on_read_only_scopes(self):
-        plaintext, _ = self.get_token(
+        plaintext, token = self.get_token(
             self.user, scopes=['runs:read', 'results:read'])
 
         # 1. POST /runs
@@ -164,7 +164,7 @@ def test_multiple_candidates_same_prefix(self):
         self.assertEqual(res3.status_code, 401)
 
     def test_auth_sets_g_api_user_and_token(self):
-        plaintext, _ = self.get_token(self.user, scopes=['system:read'])
+        plaintext, token = self.get_token(self.user, scopes=['system:read'])
         expected_user_id = self.user.id
         expected_token_id = token.id
         with self.app.test_request_context('/api/v1/system/queue', headers={'Authorization': f'Bearer {plaintext}'}):

tests/api/test_services_error_service.py

@@ -1,5 +1,5 @@
 import datetime
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, PropertyMock
 
 from flask import g
 
@@ -167,6 +167,7 @@ def test_get_sample_id(self):
         self.assertEqual(_get_sample_id(tr), 42)
 
         # Test exception catching
-        tr.regression_test = property(lambda self: (
-            _ for _ in ()).throw(RuntimeError('Mock exception')))
+        mock_reg = MagicMock()
+        type(mock_reg).sample_id = PropertyMock(side_effect=RuntimeError('Mock exception'))
+        tr.regression_test = mock_reg
         self.assertIsNone(_get_sample_id(tr))

tests/api/test_services_log_service.py

@@ -35,7 +35,7 @@ def test_read_log_lines_basic(self, mock_get_path):
         path = self.create_log_file(content)
         mock_get_path.return_value = path
 
-        lines, _ = read_log_lines(1)
+        lines, next_cursor = read_log_lines(1)
         self.assertEqual(len(lines), 3)
         self.assertIsNone(next_cursor)
         self.assertEqual(lines[0]['level'], 'info')
@@ -50,13 +50,13 @@ def test_read_log_lines_pagination(self, mock_get_path):
         path = self.create_log_file(content)
         mock_get_path.return_value = path
 
-        lines, _ = read_log_lines(1, limit=2)
+        lines, next_cursor = read_log_lines(1, limit=2)
         self.assertEqual(len(lines), 2)
         self.assertEqual(next_cursor, '2')
         self.assertEqual(lines[0]['message'], "Line 1")
         self.assertEqual(lines[1]['message'], "Line 2")
 
-        lines, _ = read_log_lines(1, cursor=next_cursor, limit=2)
+        lines, next_cursor = read_log_lines(1, cursor=next_cursor, limit=2)
         self.assertEqual(len(lines), 2)
         self.assertIsNone(next_cursor)
         self.assertEqual(lines[0]['message'], "Line 3")
@@ -68,7 +68,7 @@ def test_read_log_lines_limit_clamped(self, mock_get_path):
         path = self.create_log_file(content)
         mock_get_path.return_value = path
 
-        lines, _ = read_log_lines(1, limit=2000)
+        lines, next_cursor = read_log_lines(1, limit=2000)
         # Should be clamped to 500
         self.assertEqual(len(lines), 500)
 
@@ -79,16 +79,16 @@ def test_read_log_lines_filters(self, mock_get_path):
         mock_get_path.return_value = path
 
         # Filter by level
-        lines, _ = read_log_lines(1, level='error')
+        lines, next_cursor = read_log_lines(1, level='error')
         self.assertEqual(len(lines), 1)
         self.assertEqual(lines[0]['message'], "ERROR build: Failed")
 
         # Filter by source
-        lines, _ = read_log_lines(1, source='build')
+        lines, next_cursor = read_log_lines(1, source='build')
         self.assertEqual(len(lines), 2)
 
         # Filter by contains
-        lines, _ = read_log_lines(1, contains='STARTING')
+        lines, next_cursor = read_log_lines(1, contains='STARTING')
         self.assertEqual(len(lines), 1)
 
     @patch('mod_api.services.log_service.get_log_file_path')

tests/api/verify_schemathesis.py

@@ -72,19 +72,6 @@
 # ---------------------------------------------------------------------------
 # Helpers
 # ---------------------------------------------------------------------------
-
-
-URL_AUTH_TOKENS = URL_AUTH_TOKENS
-ADMIN_EMAIL = ADMIN_EMAIL
-SCOPE_RUNS_READ = SCOPE_RUNS_READ
-URL_SYSTEM_QUEUE = URL_SYSTEM_QUEUE
-URL_SAMPLES = URL_SAMPLES
-URL_RUNS = URL_RUNS
-URL_SYSTEM_HEALTH = URL_SYSTEM_HEALTH
-APP_JSON = APP_JSON
-# noqa: E402
-
-
 def _suppress_known_failures(exc):
     """Return True if *exc* is a FailureGroup containing only known suppressible types."""
     failure_group_cls = getattr(