Better formatting

This commit is contained in:
avogar 2024-08-05 21:16:18 +00:00
parent d3dc174533
commit 18a7a82458

View File

@ -1950,15 +1950,11 @@ class TestSuite:
) -> Dict[str, Tuple[int, int]]:
if not line.startswith(comment_sign):
return {}
random_settings_limits_str = line[
len(comment_sign) :
].lstrip() # noqa: ignore E203
random_settings_limits_str = line[len(comment_sign) :].lstrip() # noqa: ignore E203
random_settings_limits_prefix = "Random settings limits:"
if not random_settings_limits_str.startswith(random_settings_limits_prefix):
return {}
random_settings_limits_str = random_settings_limits_str[
len(random_settings_limits_prefix) :
] # noqa: ignore E203
random_settings_limits_str = random_settings_limits_str[len(random_settings_limits_prefix) :] # noqa: ignore E203
# limits are specified in a form 'setting1=(min, max), setting2=(min,max), ...'
random_settings_limits = re.findall(
"([^=, ]+) *= *(\([^=]+\))", random_settings_limits_str
@ -1996,25 +1992,20 @@ class TestSuite:
need_query_params = True
except UnicodeDecodeError:
pass
parsed_tags = parse_tags_from_line(tag_line, comment_sign)
if need_query_params:
parsed_tags.add("need-query-parameters")
random_settings_limits_line = next_line if parsed_tags else tag_line
random_settings_limits = parse_random_settings_limits_from_line(
random_settings_limits_line, comment_sign
)
parsed_tags = parse_tags_from_line(tag_line, comment_sign)
if need_query_params:
parsed_tags.add("need-query-parameters")
random_settings_limits_line = next_line if parsed_tags else tag_line
random_settings_limits = parse_random_settings_limits_from_line(
random_settings_limits_line, comment_sign
)
return parsed_tags, random_settings_limits
all_tags = {}
all_random_settings_limits = {}
start_time = datetime.now()
for test_name in all_tests:
(
tags,
random_settings_limits,
) = load_tags_and_random_settings_limits_from_file(
os.path.join(suite_dir, test_name)
)
tags, random_settings_limits = load_tags_and_random_settings_limits_from_file(os.path.join(suite_dir, test_name)) # noqa: ignore E203
if tags:
all_tags[test_name] = tags
if random_settings_limits:
@ -2061,9 +2052,7 @@ class TestSuite:
)
)
self.all_tags: Dict[str, Set[str]] = all_tags_and_random_settings_limits[0]
self.all_random_settings_limits: Dict[
str, Dict[str, (int, int)]
] = all_tags_and_random_settings_limits[1]
self.all_random_settings_limits: Dict[str, Dict[str, (int, int)]] = all_tags_and_random_settings_limits[1] # noqa: ignore E203
self.sequential_tests = []
self.parallel_tests = []