hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 08:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review - code quality improvements

Browse Source 
Co-authored-by: Paolo Tranquilli <redsun82@github.com>
This commit is contained in:
Tamás Vajk
2025-04-24 10:29:48 +02:00
committed by Tamas Vajk
parent a4a24470c8
commit c54b684132
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
misc/pytest/lib/query_suites.py
View File

@@ -5,18 +5,18 @@ import pytest
@pytest.fixture @pytest.fixture
def check_query_suite(codeql, cwd, expected_files, semmle_code_dir): def check_query_suite(codeql, cwd, expected_files, semmle_code_dir):
def ret(query_suite): def ret(query_suite):
actual = codeql.resolve.queries(query_suite, _capture=True).strip() actual = codeql.resolve.queries(query_suite, _capture=True)
actual = sorted(actual.splitlines()) actual = sorted(actual.splitlines())
actual = [os.path.relpath(q, semmle_code_dir) for q in actual] actual = [os.path.relpath(q, semmle_code_dir) for q in actual]
actual_file_name = query_suite + '.actual' actual_file_name = query_suite + '.actual'
expected_files.add(actual_file_name) expected_files.add(actual_file_name)
(cwd / actual_file_name).write_text('\n'.join(actual)+'\n') (cwd / actual_file_name).write_text('\n'.join(actual) + '\n')
return ret return ret
@pytest.fixture @pytest.fixture
def check_queries_not_included(codeql, cwd, expected_files, semmle_code_dir): def check_queries_not_included(codeql, cwd, expected_files, semmle_code_dir):
def ret(lang_folder_name, query_suites): def ret(lang_folder_name, query_suites):
all_queries = codeql.resolve.queries(semmle_code_dir / 'ql' / lang_folder_name / 'ql' / 'src', _capture=True).strip().splitlines() all_queries = codeql.resolve.queries(semmle_code_dir / 'ql' / lang_folder_name / 'ql' / 'src', _capture=True).splitlines()
included_in_qls = set() included_in_qls = set()
for query_suite in query_suites: for query_suite in query_suites:
@@ -26,5 +26,5 @@ def check_queries_not_included(codeql, cwd, expected_files, semmle_code_dir):
not_included = [os.path.relpath(q, semmle_code_dir) for q in not_included] not_included = [os.path.relpath(q, semmle_code_dir) for q in not_included]
not_included_file_name = 'not_included_in_qls.actual' not_included_file_name = 'not_included_in_qls.actual'
expected_files.add(not_included_file_name) expected_files.add(not_included_file_name)
(cwd / not_included_file_name).write_text('\n'.join(not_included)+'\n') (cwd / not_included_file_name).write_text('\n'.join(not_included) + '\n')
return ret return ret