Merge branch 'master' into feature/issue-1072-negative-runtime

Hell1213 · web-flow · commit d74226edd895 · 2026-03-22T12:35:08.000+05:30
diff --git a/exceptions.py b/exceptions.py
@@ -3,10 +3,13 @@
 
 
 class QueuedSampleNotFoundException(Exception):
-    """Custom exception handler for queued sample not found."""
+    """Raised when a queued sample cannot be found by the given ID."""
 
-    def __init__(self, message: str) -> None:
-        Exception.__init__(self)
+    def __init__(self, message="Queued sample not found."):
+        # By providing a default, all existing raise sites that call
+        # this exception without arguments will still work, and new
+        # calls can optionally provide a custom message.
+        super().__init__(message)
         self.message = message
 
 
diff --git a/mod_auth/models.py b/mod_auth/models.py
@@ -77,7 +77,7 @@ def generate_hash(password: str) -> str:
         :rtype : str
         """
         # Go for increased strength no matter what
-        return pwd_context.encrypt(password, category='admin')
+        return pwd_context.hash(password, category='admin')
 
     @staticmethod
     def create_random_password(length=16) -> str:
diff --git a/mod_ci/controllers.py b/mod_ci/controllers.py
@@ -26,7 +26,7 @@
 from lxml import etree
 from markdown2 import markdown
 from pymysql.err import IntegrityError
-from sqlalchemy import and_, func
+from sqlalchemy import and_, func, select
 from sqlalchemy.sql import label
 from sqlalchemy.sql.functions import count
 from werkzeug.utils import secure_filename
@@ -1188,8 +1188,10 @@ def create_instance(compute, project, zone, test, reportURL) -> Dict:
     if test.platform == TestPlatform.linux:
         image_response = compute.images().getFromFamily(project=config.get('LINUX_INSTANCE_PROJECT_NAME', ''),
                                                         family=config.get('LINUX_INSTANCE_FAMILY_NAME', '')).execute()
-        startup_script = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
-                                           'ci-linux', 'startup-script.sh'), 'r').read()
+        with open(os.path.join(
+                config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
+                'ci-linux', 'startup-script.sh'), 'r') as f:
+            startup_script = f.read()
         metadata_items = [
             {'key': 'startup-script', 'value': startup_script},
             {'key': 'reportURL', 'value': reportURL},
@@ -1198,12 +1200,18 @@ def create_instance(compute, project, zone, test, reportURL) -> Dict:
     elif test.platform == TestPlatform.windows:
         image_response = compute.images().getFromFamily(project=config.get('WINDOWS_INSTANCE_PROJECT_NAME', ''),
                                                         family=config.get('WINDOWS_INSTANCE_FAMILY_NAME', '')).execute()
-        startup_script = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
-                                           'ci-windows', 'startup-script.ps1'), 'r').read()
-        service_account = open(os.path.join(config.get('INSTALL_FOLDER', ''),
-                                            config.get('SERVICE_ACCOUNT_FILE', '')), 'r').read()
-        rclone_conf = open(os.path.join(config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
-                                        'ci-windows', 'rclone.conf'), 'r').read()
+        with open(os.path.join(
+                config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
+                'ci-windows', 'startup-script.ps1'), 'r') as f:
+            startup_script = f.read()
+        with open(os.path.join(
+                config.get('INSTALL_FOLDER', ''),
+                config.get('SERVICE_ACCOUNT_FILE', '')), 'r') as f:
+            service_account = f.read()
+        with open(os.path.join(
+                config.get('INSTALL_FOLDER', ''), 'install', 'ci-vm',
+                'ci-windows', 'rclone.conf'), 'r') as f:
+            rclone_conf = f.read()
         metadata_items = [
             {'key': 'windows-startup-script-ps1', 'value': startup_script},
             {'key': 'service_account', 'value': service_account},
@@ -2431,13 +2439,15 @@ def progress_type_request(log, test, test_id, request) -> bool:
                 TestResult.test_id == test.id,
                 TestResult.exit_code != TestResult.expected_rc
             )).scalar()
-        results_zero_rc = g.db.query(RegressionTest.id).filter(
+        results_zero_rc = select(RegressionTest.id).filter(
             RegressionTest.expected_rc == 0
-        ).subquery()
+        )
         results = g.db.query(count(TestResultFile.got)).filter(
             and_(
                 TestResultFile.test_id == test.id,
-                TestResultFile.regression_test_id.in_(results_zero_rc),
+                TestResultFile.regression_test_id.in_(
+                    results_zero_rc.select()
+                ),
                 TestResultFile.got.isnot(None)
             )
         ).scalar()
@@ -2509,17 +2519,17 @@ def update_final_status():
         total_time = 0
 
         if current_average is None:
-            platform_tests = g.db.query(Test.id).filter(Test.platform == test.platform).subquery()
-            finished_tests = g.db.query(TestProgress.test_id).filter(
+            platform_tests = select(Test.id).filter(Test.platform == test.platform)
+            finished_tests = select(TestProgress.test_id).filter(
                 and_(
                     TestProgress.status.in_([TestStatus.canceled, TestStatus.completed]),
-                    TestProgress.test_id.in_(platform_tests)
+                    TestProgress.test_id.in_(platform_tests.select())
                 )
-            ).subquery()
+            )
             in_progress_statuses = [TestStatus.preparation, TestStatus.completed, TestStatus.canceled]
             finished_tests_progress = g.db.query(TestProgress).filter(
                 and_(
-                    TestProgress.test_id.in_(finished_tests),
+                    TestProgress.test_id.in_(finished_tests.select()),
                     TestProgress.status.in_(in_progress_statuses)
                 )
             ).subquery()
diff --git a/mod_customized/controllers.py b/mod_customized/controllers.py
@@ -4,7 +4,7 @@
 
 from flask import Blueprint, g, redirect, request, url_for
 from github import Auth, Github, GithubException
-from sqlalchemy import and_
+from sqlalchemy import and_, select
 
 from decorators import template_renderer
 from mod_auth.controllers import (check_access_rights,
@@ -81,7 +81,7 @@ def index():
     elif username is not None:
         g.log.error('GitHub token not configured, cannot fetch commits')
 
-    populated_categories = g.db.query(regressionTestLinkTable.c.category_id).subquery()
+    populated_categories = select(regressionTestLinkTable.c.category_id)
     categories = Category.query.filter(Category.id.in_(populated_categories)).order_by(Category.name.asc()).all()
 
     tests = Test.query.filter(and_(TestFork.user_id == g.user.id, TestFork.test_id == Test.id)).order_by(
diff --git a/mod_health/controllers.py b/mod_health/controllers.py
@@ -2,7 +2,7 @@
 
 import os
 import subprocess
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional, Tuple
 
 from flask import Blueprint, current_app, jsonify
@@ -79,7 +79,7 @@ def health_check() -> Tuple[Any, int]:
 
     checks: Dict[str, Any] = {
         'status': 'healthy' if all_healthy else 'unhealthy',
-        'timestamp': datetime.utcnow().isoformat() + 'Z',
+        'timestamp': datetime.now(timezone.utc).isoformat(),
         'checks': check_results
     }
 
@@ -99,7 +99,7 @@ def liveness_check() -> Tuple[Any, int]:
     """
     return jsonify({
         'status': 'alive',
-        'timestamp': datetime.utcnow().isoformat() + 'Z'
+        'timestamp': datetime.now(timezone.utc).isoformat()
     }), 200
 
 
@@ -172,7 +172,7 @@ def version_check() -> Tuple[Any, int]:
     git_info = get_git_info()
 
     response = {
-        'timestamp': datetime.utcnow().isoformat() + 'Z',
+        'timestamp': datetime.now(timezone.utc).isoformat(),
         'git': git_info,
     }
 
diff --git a/mod_sample/controllers.py b/mod_sample/controllers.py
@@ -5,6 +5,7 @@
 from typing import Any, Dict
 
 from flask import Blueprint, g, redirect, request, url_for
+from sqlalchemy import select
 
 from decorators import template_renderer
 from exceptions import SampleNotFoundException
@@ -66,14 +67,14 @@ def display_sample_info(sample) -> Dict[str, Any]:
 
     if len(regression_tests) > 0:
         if test_commit is not None:
-            sq = g.db.query(RegressionTest.id).filter(RegressionTest.sample_id == sample.id).subquery()
+            sq = select(RegressionTest.id).filter(RegressionTest.sample_id == sample.id)
             exit_code = g.db.query(TestResult.exit_code).filter(and_(
                 TestResult.exit_code != TestResult.expected_rc,
-                and_(TestResult.test_id == test_commit.id, TestResult.regression_test_id.in_(sq))
+                and_(TestResult.test_id == test_commit.id, TestResult.regression_test_id.in_(sq.select()))
             )).first()
             not_null = g.db.query(TestResultFile.got).filter(and_(
                 TestResultFile.got.isnot(None),
-                and_(TestResultFile.test_id == test_commit.id, TestResultFile.regression_test_id.in_(sq))
+                and_(TestResultFile.test_id == test_commit.id, TestResultFile.regression_test_id.in_(sq.select()))
             )).first()
 
             if exit_code is None and not_null is None:
@@ -82,17 +83,17 @@ def display_sample_info(sample) -> Dict[str, Any]:
                 status = 'Fail'
 
         if test_release is not None:
-            sq = g.db.query(RegressionTest.id).filter(
-                RegressionTest.sample_id == sample.id).subquery()
+            sq = select(RegressionTest.id).filter(
+                RegressionTest.sample_id == sample.id)
             exit_code = g.db.query(TestResult.exit_code).filter(
                 and_(
                     TestResult.exit_code != TestResult.expected_rc,
-                    and_(TestResult.test_id == test_release.id, TestResult.regression_test_id.in_(sq))
+                    and_(TestResult.test_id == test_release.id, TestResult.regression_test_id.in_(sq.select()))
                 )
             ).first()
             not_null = g.db.query(TestResultFile.got).filter(and_(
                 TestResultFile.got.isnot(None),
-                and_(TestResultFile.test_id == test_release.id, TestResultFile.regression_test_id.in_(sq))
+                and_(TestResultFile.test_id == test_release.id, TestResultFile.regression_test_id.in_(sq.select()))
             )).first()
 
             if exit_code is None and not_null is None:
diff --git a/mod_sample/media_info_parser.py b/mod_sample/media_info_parser.py
@@ -210,10 +210,10 @@ def generate_media_xml(sample) -> MediaInfoFetcher:
 
         media_folder = os.path.join(config.get('SAMPLE_REPOSITORY', ''), 'TestFiles')
         media_info_path = os.path.join(media_folder, 'media', sample.sha + '.xml')
-        output_handle = open(media_info_path, 'w')
         media_path = os.path.join(media_folder, sample.filename)
-        process = subprocess.Popen(['mediainfo', '--Output=XML', media_path], stdout=output_handle)
-        process.wait()
+        with open(media_info_path, 'w') as output_handle:
+            process = subprocess.Popen(['mediainfo', '--Output=XML', media_path], stdout=output_handle)
+            process.wait()
         if os.path.isfile(media_info_path):
             # Load media info, and replace full pathname
             tree = etree.parse(media_info_path)
diff --git a/mod_test/controllers.py b/mod_test/controllers.py
@@ -5,7 +5,7 @@
 
 from flask import (Blueprint, Response, abort, g, jsonify, redirect, request,
                    url_for)
-from sqlalchemy import and_
+from sqlalchemy import and_, select
 
 from decorators import template_renderer
 from exceptions import TestNotFoundException
@@ -60,7 +60,7 @@ def get_test_results(test) -> List[Dict[str, Any]]:
     :param test: The test to retrieve the data for.
     :type test: Test
     """
-    populated_categories = g.db.query(regressionTestLinkTable.c.category_id).subquery()
+    populated_categories = select(regressionTestLinkTable.c.category_id)
     categories = Category.query.filter(Category.id.in_(populated_categories)).order_by(Category.name.asc()).all()
     results = [{
         'category': category,
diff --git a/requirements.txt b/requirements.txt
@@ -20,8 +20,8 @@ WTForms==3.2.1
 MarkupSafe==3.0.3
 jinja2==3.1.6
 itsdangerous==2.2.0
-google-api-python-client==2.192.0
-google-cloud-storage==3.9.0
+google-api-python-client==2.193.0
+google-cloud-storage==3.10.0
 cffi==2.0.0
 PyGithub==2.8.1
 blinker==1.9.0
diff --git a/templates/regression/index.html b/templates/regression/index.html
@@ -216,8 +216,8 @@ <h5>Regression tests</h5>
 
         $(document).ready(function(){
             const urlParams = new URLSearchParams(window.location.search);
-            const hash = urlParams.get("category");
-            if(hash === "") hash = "1";
+            let hash = urlParams.get("category");
+            if(!hash || hash === "") hash = "1";
             $("#category").find("option").each(function(idx, elm){
                 if($(elm).val() === hash){
                     $(elm).attr("selected",true);
diff --git a/templates/test/by_id.html b/templates/test/by_id.html
@@ -286,10 +286,8 @@ <h6>There are no tests executed in this category.</h6>
                     reveal.setAttribute('data-reveal', '');
                     reveal.innerHTML = resp;
                     reveal.innerHTML +=
-                        '<a href="'+diff_download_url+'" target="_blank">' +
-                            '<button type="button">' +
+                        '<a href="' + diff_download_url + '" target="_blank" class="diff-download-link">' +
                             'Download Full Diff' +
-                            '</button>' +
                         '</a>, only first 50 shown here.';
                     reveal.innerHTML +=
                         '<button class="close-button" data-close aria-label="Cancel" type="button">' +
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -5,4 +5,4 @@ isort==8.0.1
 mypy==1.19.1
 Flask-Testing==0.8.1
 nose2-cov==1.0a4
-coverage==7.13.4
+coverage==7.13.5
diff --git a/tests/base.py b/tests/base.py
@@ -11,6 +11,7 @@
 from sqlalchemy import text
 from werkzeug.datastructures import Headers
 
+import utility
 from database import create_session
 from mod_auth.models import Role, User
 from mod_customized.models import CustomizedTest, TestFork
@@ -278,6 +279,15 @@ def create_app(self, mock_config, mock_storage_client):
 
     def setUp(self):
         """Set up all entities."""
+        from datetime import datetime
+
+        import utility
+
+        # Reset the state directly for test isolation. No mocks needed!
+        utility.cached_load_time = datetime(1970, 1, 1)
+        utility.cached_web_hook_blocks = []
+
+        super().setUp()
         self.app.preprocess_request()
         g.db = create_session(
             self.app.config['DATABASE_URI'], drop_tables=True)
@@ -396,6 +406,10 @@ def setUp(self):
         g.db.add_all(forbidden_ext)
         g.db.commit()
 
+    def tearDown(self):
+        """Clean up after every test."""
+        super().tearDown()
+
     @staticmethod
     def create_login_form_data(email, password) -> dict:
         """
diff --git a/tests/test_regression/test_controllers.py b/tests/test_regression/test_controllers.py
@@ -566,3 +566,12 @@ def test_add_test_output_and_check_double_hashes(self):
                 ).count(),
                 1
             )
+
+    def test_category_description_shown_without_tags(self):
+        """Test that category description is shown when accessing /regression/ with category parameter but no tags."""
+        response = self.app.test_client().get('/regression/?category=1')
+        self.assertEqual(response.status_code, 200)
+        # Check that the category description span is present and not hidden
+        self.assertIn('data-category="1"', str(response.data))
+        # The JavaScript should ensure the description is visible, but we can't test JS execution in unit tests
+        # This test verifies the HTML structure is correct for the fix to work
diff --git a/tests/test_upload/test_controllers.py b/tests/test_upload/test_controllers.py
diff --git a/utility.py b/utility.py
