From f5366659cf79edd1bd477709d95398175133a39a Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Thu, 12 Sep 2019 14:59:25 -0600 Subject: [PATCH 1/3] Compare lowercased strings This was causing a test to fail on Windows when comparing "C:" versus "c:". --- tests/framework/test_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/test_setup.py b/tests/framework/test_setup.py index 56e74e05..f993e09e 100644 --- a/tests/framework/test_setup.py +++ b/tests/framework/test_setup.py @@ -39,4 +39,4 @@ def test_find_metadata(path_to_meta): class _MyBmi: METADATA = path_to_meta - assert find_model_metadata(_MyBmi) == expected + assert find_model_metadata(_MyBmi).lower() == expected.lower() From 32f5133897f337a5d68b0d9cee8fe2e1564f1f44 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Mon, 13 Jan 2020 14:23:04 -0700 Subject: [PATCH 2/3] Revert "Compare lowercased strings" This reverts commit f5366659cf79edd1bd477709d95398175133a39a. I've found a better way to fix the issue. --- tests/framework/test_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/test_setup.py b/tests/framework/test_setup.py index f993e09e..56e74e05 100644 --- a/tests/framework/test_setup.py +++ b/tests/framework/test_setup.py @@ -39,4 +39,4 @@ def test_find_metadata(path_to_meta): class _MyBmi: METADATA = path_to_meta - assert find_model_metadata(_MyBmi).lower() == expected.lower() + assert find_model_metadata(_MyBmi) == expected From 07849312b9f4169d11058103d5fd3e1db9ddee40 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Mon, 13 Jan 2020 14:25:32 -0700 Subject: [PATCH 3/3] Use os.path.normcase to match Windows drive letters The normcase function lowercases Windows drive letters. --- pymt/framework/bmi_metadata.py | 2 +- tests/framework/test_setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pymt/framework/bmi_metadata.py b/pymt/framework/bmi_metadata.py index 6604ad72..9c5505d6 100644 --- a/pymt/framework/bmi_metadata.py +++ b/pymt/framework/bmi_metadata.py @@ -94,7 +94,7 @@ def find_model_metadata(plugin): else: path_to_mmd = model_metadata_dir - return os.path.abspath(path_to_mmd) + return os.path.normcase(os.path.abspath(path_to_mmd)) class PluginMetadata(ModelMetadata): diff --git a/tests/framework/test_setup.py b/tests/framework/test_setup.py index 56e74e05..d7a1ff8f 100644 --- a/tests/framework/test_setup.py +++ b/tests/framework/test_setup.py @@ -32,7 +32,7 @@ def test_author_multiple_authors(key, iter): @pytest.mark.parametrize("path_to_meta", ("", ".", "meta", "/usr/local/share")) def test_find_metadata(path_to_meta): - expected = os.path.abspath(os.path.join(os.path.dirname(__file__), path_to_meta)) + expected = os.path.normcase(os.path.abspath(os.path.join(os.path.dirname(__file__), path_to_meta))) if expected.endswith(os.path.sep): expected = expected[:-1]