From 4dfdb11de036d33f9d37087892382d50a1d80b7e Mon Sep 17 00:00:00 2001 From: George Psimenos Date: Thu, 18 Mar 2021 14:18:56 +0000 Subject: [PATCH] Move pinvalidate files --- .../pin_names => pinvalidate}/pinvalidate.py | 12 ++++++------ .../pinvalidate_test.py | 17 +++++++++-------- hal/tests/pinvalidate/test_files/.mbedignore | 1 + .../test_files/PinNames.h | 0 .../test_files/PinNames_test.h | 0 .../test_files/duplicate_file/PinNames.h | 0 .../test_files/duplicate_marker/PinNames.h | 0 .../test_files/misformatted_marker/PinNames.h | 0 .../test_files/missing_marker/PinNames.h | 0 .../test_files/nonexistent_target/PinNames.h | 0 10 files changed, 16 insertions(+), 14 deletions(-) rename hal/tests/{TESTS/pin_names => pinvalidate}/pinvalidate.py (98%) rename hal/tests/{TESTS/pin_names => pinvalidate}/pinvalidate_test.py (85%) create mode 100644 hal/tests/pinvalidate/test_files/.mbedignore rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/PinNames.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/PinNames_test.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/duplicate_file/PinNames.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/duplicate_marker/PinNames.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/misformatted_marker/PinNames.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/missing_marker/PinNames.h (100%) rename hal/tests/{TESTS/pin_names => pinvalidate}/test_files/nonexistent_target/PinNames.h (100%) diff --git a/hal/tests/TESTS/pin_names/pinvalidate.py b/hal/tests/pinvalidate/pinvalidate.py similarity index 98% rename from hal/tests/TESTS/pin_names/pinvalidate.py rename to hal/tests/pinvalidate/pinvalidate.py index 2c95407222..ba398d6f39 100755 --- a/hal/tests/TESTS/pin_names/pinvalidate.py +++ b/hal/tests/pinvalidate/pinvalidate.py @@ -48,7 +48,7 @@ class ArgumentParserWithDefaultHelp(argparse.ArgumentParser): def find_target_by_path(target_path): """Find a target by path.""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] targets = dict() @@ -95,7 +95,7 @@ def find_target_by_path(target_path): def find_target_by_name(target_name=""): """Find a target by name.""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] targets = dict() @@ -131,7 +131,7 @@ def find_target_by_name(target_name=""): def check_markers(test_mode=False): """Validate markers in PinNames.h files""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] errors = [] @@ -185,7 +185,7 @@ def check_markers(test_mode=False): def check_duplicate_pinnames_files(test_mode=False): """Check for duplicate PinNames.h files""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] errors = [] @@ -218,7 +218,7 @@ def check_duplicate_pinnames_files(test_mode=False): def check_duplicate_markers(test_mode=False): """Check target markers in PinNames.h files for duplicates.""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] errors = [] @@ -260,7 +260,7 @@ def check_duplicate_markers(test_mode=False): def target_has_arduino_form_factor(target_name): """Check if the target has the Arduino form factor.""" - mbed_os_root = pathlib.Path(__file__).absolute().parents[4] + mbed_os_root = pathlib.Path(__file__).absolute().parents[3] with ( mbed_os_root.joinpath("targets", "targets.json") diff --git a/hal/tests/TESTS/pin_names/pinvalidate_test.py b/hal/tests/pinvalidate/pinvalidate_test.py similarity index 85% rename from hal/tests/TESTS/pin_names/pinvalidate_test.py rename to hal/tests/pinvalidate/pinvalidate_test.py index ca05d5591c..07f4e21c4a 100644 --- a/hal/tests/TESTS/pin_names/pinvalidate_test.py +++ b/hal/tests/pinvalidate/pinvalidate_test.py @@ -15,6 +15,7 @@ limitations under the License. """ import pytest +import os from pinvalidate import * @pytest.fixture @@ -28,27 +29,27 @@ def pin_name_dict(pin_name_content): def test_marker_check(): expect = [ - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/nonexistent_target/PinNames.h', 'error': 'target not found'}, - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/misformatted_marker/PinNames.h', 'error': 'marker invalid or not found'}, - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/missing_marker/PinNames.h', 'error': 'marker invalid or not found'} + {'file': os.path.abspath('./test_files/nonexistent_target/PinNames.h'), 'error': 'target not found'}, + {'file': os.path.abspath('./test_files/misformatted_marker/PinNames.h'), 'error': 'marker invalid or not found'}, + {'file': os.path.abspath('./test_files/missing_marker/PinNames.h'), 'error': 'marker invalid or not found'} ] assert check_markers(test_mode=True) == expect def test_duplicate_pinnames_files_check(): expect = [ - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/PinNames.h', 'error': 'duplicate file'}, - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/duplicate_marker/PinNames.h', 'error': 'duplicate file'} + {'file': os.path.abspath('./test_files/PinNames.h'), 'error': 'duplicate file'}, + {'file': os.path.abspath('./test_files/duplicate_marker/PinNames.h'), 'error': 'duplicate file'} ] assert check_duplicate_pinnames_files(test_mode=True) == expect def test_duplicate_markers_check(): expect = [ - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/duplicate_file/PinNames.h', 'error': 'duplicate marker'}, - {'file': '/Users/geopsi01/Development/mbed-os/hal/tests/TESTS/pin_names/test_files/duplicate_marker/PinNames.h', 'error': 'duplicate marker'} + {'file': os.path.abspath('./test_files/duplicate_file/PinNames.h'), 'error': 'duplicate marker'}, + {'file': os.path.abspath('./test_files/duplicate_marker/PinNames.h'), 'error': 'duplicate marker'} ] - + assert check_duplicate_markers(test_mode=True) == expect def test_pin_name_to_dict(pin_name_dict): diff --git a/hal/tests/pinvalidate/test_files/.mbedignore b/hal/tests/pinvalidate/test_files/.mbedignore new file mode 100644 index 0000000000..f59ec20aab --- /dev/null +++ b/hal/tests/pinvalidate/test_files/.mbedignore @@ -0,0 +1 @@ +* \ No newline at end of file diff --git a/hal/tests/TESTS/pin_names/test_files/PinNames.h b/hal/tests/pinvalidate/test_files/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/PinNames.h rename to hal/tests/pinvalidate/test_files/PinNames.h diff --git a/hal/tests/TESTS/pin_names/test_files/PinNames_test.h b/hal/tests/pinvalidate/test_files/PinNames_test.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/PinNames_test.h rename to hal/tests/pinvalidate/test_files/PinNames_test.h diff --git a/hal/tests/TESTS/pin_names/test_files/duplicate_file/PinNames.h b/hal/tests/pinvalidate/test_files/duplicate_file/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/duplicate_file/PinNames.h rename to hal/tests/pinvalidate/test_files/duplicate_file/PinNames.h diff --git a/hal/tests/TESTS/pin_names/test_files/duplicate_marker/PinNames.h b/hal/tests/pinvalidate/test_files/duplicate_marker/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/duplicate_marker/PinNames.h rename to hal/tests/pinvalidate/test_files/duplicate_marker/PinNames.h diff --git a/hal/tests/TESTS/pin_names/test_files/misformatted_marker/PinNames.h b/hal/tests/pinvalidate/test_files/misformatted_marker/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/misformatted_marker/PinNames.h rename to hal/tests/pinvalidate/test_files/misformatted_marker/PinNames.h diff --git a/hal/tests/TESTS/pin_names/test_files/missing_marker/PinNames.h b/hal/tests/pinvalidate/test_files/missing_marker/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/missing_marker/PinNames.h rename to hal/tests/pinvalidate/test_files/missing_marker/PinNames.h diff --git a/hal/tests/TESTS/pin_names/test_files/nonexistent_target/PinNames.h b/hal/tests/pinvalidate/test_files/nonexistent_target/PinNames.h similarity index 100% rename from hal/tests/TESTS/pin_names/test_files/nonexistent_target/PinNames.h rename to hal/tests/pinvalidate/test_files/nonexistent_target/PinNames.h