5
5
@pytest .fixture
6
6
def check_query_suite (codeql , cwd , expected_files , semmle_code_dir ):
7
7
def ret (query_suite ):
8
- actual = codeql .resolve .queries (query_suite , _capture = True ). strip ()
8
+ actual = codeql .resolve .queries (query_suite , _capture = True )
9
9
actual = sorted (actual .splitlines ())
10
10
actual = [os .path .relpath (q , semmle_code_dir ) for q in actual ]
11
11
actual_file_name = query_suite + '.actual'
12
12
expected_files .add (actual_file_name )
13
- (cwd / actual_file_name ).write_text ('\n ' .join (actual )+ '\n ' )
13
+ (cwd / actual_file_name ).write_text ('\n ' .join (actual ) + '\n ' )
14
14
return ret
15
15
16
16
@pytest .fixture
17
17
def check_queries_not_included (codeql , cwd , expected_files , semmle_code_dir ):
18
18
def ret (lang_folder_name , query_suites ):
19
- all_queries = codeql .resolve .queries (semmle_code_dir / 'ql' / lang_folder_name / 'ql' / 'src' , _capture = True ).strip (). splitlines ()
19
+ all_queries = codeql .resolve .queries (semmle_code_dir / 'ql' / lang_folder_name / 'ql' / 'src' , _capture = True ).splitlines ()
20
20
21
21
included_in_qls = set ()
22
22
for query_suite in query_suites :
@@ -26,5 +26,5 @@ def ret(lang_folder_name, query_suites):
26
26
not_included = [os .path .relpath (q , semmle_code_dir ) for q in not_included ]
27
27
not_included_file_name = 'not_included_in_qls.actual'
28
28
expected_files .add (not_included_file_name )
29
- (cwd / not_included_file_name ).write_text ('\n ' .join (not_included )+ '\n ' )
29
+ (cwd / not_included_file_name ).write_text ('\n ' .join (not_included ) + '\n ' )
30
30
return ret
0 commit comments