From c787b3da07a7c9ddc4829c91ca47c847de3769dc Mon Sep 17 00:00:00 2001 From: Peter Hawkins Date: Mon, 12 Jun 2023 21:57:41 -0400 Subject: [PATCH] Change metadata_test to tolerate paths with backslashes. Fixes a test failure under Windows. The backslashes end up doubled in the MLIR string because of escaping. --- tests/metadata_test.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/metadata_test.py b/tests/metadata_test.py index 49d87851a..86a85046d 100644 --- a/tests/metadata_test.py +++ b/tests/metadata_test.py @@ -94,17 +94,17 @@ class MetadataTest(jtu.JaxTestCase): ) # Sanity check - self.assertIn("/tests/metadata_test.py", make_hlo()) + self.assertRegex(make_hlo(), r"[/\\]+tests[/\\]+metadata_test.py") - with jax_config.hlo_source_file_canonicalization_regex(".*/tests/"): + with jax_config.hlo_source_file_canonicalization_regex(r".*[\\/]+tests[/\\]+"): hlo = make_hlo() self.assertIn("metadata_test.py", hlo) - self.assertNotIn("tests/", hlo) - self.assertNotIn("/metadata_test.py", hlo) + self.assertNotRegex(hlo, r"tests[/\\]+") + self.assertNotRegex(hlo, r"[/\\]+metadata_test.py") with jax_config.hlo_source_file_canonicalization_regex("no_match_xxx"): hlo = make_hlo() - self.assertIn("/tests/metadata_test.py", hlo) + self.assertRegex(hlo, r"[/\\]+tests[/\\]+metadata_test.py") with jax_config.hlo_source_file_canonicalization_regex(".*"): hlo = make_hlo() @@ -112,7 +112,8 @@ class MetadataTest(jtu.JaxTestCase): with jax_config.hlo_source_file_canonicalization_regex("test"): hlo = make_hlo() - self.assertIn("/s/metadata_.py", hlo) + self.assertRegex(hlo, r"[/\\]+s[/\\]+metadata_.py") + if __name__ == "__main__": absltest.main(testLoader=jtu.JaxTestLoader())