Skip to content

Commit b7957ae

Browse files
Use better way of globbing
The pattern "glob(join(dir, pattern))" fails if "dir" also contains wildcard characters. Since Python 3.10 there is a way to work around this. This commit changes a test where it is easy to adopt this.
1 parent 8650f00 commit b7957ae

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

benchexec/test_integration/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,11 +753,13 @@ def test_description(self):
753753
desc.name,
754754
)
755755

756-
generated_files = glob.glob(os.path.join(self.output_dir, "*.xml"))
756+
generated_files = glob.glob("*.xml", root_dir=self.output_dir)
757757
assert generated_files, "error in test, no results generated"
758758

759759
for f in generated_files:
760-
result_xml = ElementTree.ElementTree().parse(f)
760+
result_xml = ElementTree.ElementTree().parse(
761+
os.path.join(self.output_dir, f)
762+
)
761763
actual_description = result_xml.find("description").text
762764
self.assertEqual(actual_description, test_description.strip())
763765

@@ -771,11 +773,13 @@ def test_environment(self):
771773
},
772774
)
773775

774-
generated_files = glob.glob(os.path.join(self.output_dir, "*.xml"))
776+
generated_files = glob.glob("*.xml", root_dir=self.output_dir)
775777
assert generated_files, "error in test, no results generated"
776778

777779
for f in generated_files:
778-
result_xml = ElementTree.ElementTree().parse(f)
780+
result_xml = ElementTree.ElementTree().parse(
781+
os.path.join(self.output_dir, f)
782+
)
779783
environment = result_xml.find("systeminfo").find("environment")
780784
var_tags = {tag.attrib["name"]: tag for tag in environment.findall("var")}
781785
self.assertEqual(var_tags["BENCHEXEC_TEST_VAR"].text, "YQEbYg==")

0 commit comments

Comments
 (0)