diff --git a/mod_ci/controllers.py b/mod_ci/controllers.py index 591284737..2d81a713b 100755 --- a/mod_ci/controllers.py +++ b/mod_ci/controllers.py @@ -2640,7 +2640,7 @@ def update_final_status(): finished_tests = select(TestProgress.test_id).filter( and_( TestProgress.status.in_([TestStatus.canceled, TestStatus.completed]), - TestProgress.test_id.in_(platform_tests.select()) + TestProgress.test_id.in_(platform_tests) ) ) times = g.db.query( diff --git a/mod_sample/controllers.py b/mod_sample/controllers.py index 7b3d5d85a..dc3ef161f 100755 --- a/mod_sample/controllers.py +++ b/mod_sample/controllers.py @@ -70,11 +70,11 @@ def display_sample_info(sample) -> Dict[str, Any]: 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.select())) + and_(TestResult.test_id == test_commit.id, TestResult.regression_test_id.in_(sq)) )).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.select())) + and_(TestResultFile.test_id == test_commit.id, TestResultFile.regression_test_id.in_(sq)) )).first() if exit_code is None and not_null is None: @@ -88,12 +88,12 @@ def display_sample_info(sample) -> Dict[str, Any]: 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.select())) + and_(TestResult.test_id == test_release.id, TestResult.regression_test_id.in_(sq)) ) ).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.select())) + and_(TestResultFile.test_id == test_release.id, TestResultFile.regression_test_id.in_(sq)) )).first() if exit_code is None and not_null is None: