From 99949a1a136dd9239a8c686c55af12f88d6b1f16 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Thu, 7 Dec 2023 23:21:59 +0100 Subject: [PATCH] Rename testing config so it doesn't get run in the config_tests These tests are meant for real configs using real modules, the testing config doesn't run on its own Signed-off-by: Kai-Uwe Hermann --- ...sting-config-test-cpp-error-handling.yaml} | 0 tests/framework_tests/cpp_tests.py | 20 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) rename tests/everest-core_tests/config/{config-test-cpp-error-handling.yaml => everest-core-testing-config-test-cpp-error-handling.yaml} (100%) diff --git a/tests/everest-core_tests/config/config-test-cpp-error-handling.yaml b/tests/everest-core_tests/config/everest-core-testing-config-test-cpp-error-handling.yaml similarity index 100% rename from tests/everest-core_tests/config/config-test-cpp-error-handling.yaml rename to tests/everest-core_tests/config/everest-core-testing-config-test-cpp-error-handling.yaml diff --git a/tests/framework_tests/cpp_tests.py b/tests/framework_tests/cpp_tests.py index 159344961..f1becbf43 100644 --- a/tests/framework_tests/cpp_tests.py +++ b/tests/framework_tests/cpp_tests.py @@ -454,7 +454,7 @@ def error_handling_tester(self, probe_module: ProbeModule): """ return ErrorHandlingTester(probe_module) - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_raise_error( self, @@ -479,7 +479,7 @@ async def test_raise_error( assert recieved_error['message'] == err_args['message'], 'Received wrong error message' assert recieved_error['severity'] == err_args['severity'], 'Received wrong error severity' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_clear_error_by_uuid( self, @@ -512,7 +512,7 @@ async def test_clear_error_by_uuid( cleared_error = error_handling_tester.probe_module['errors_cleared_TestErrorA'][0] assert raised_error == cleared_error, 'Raised error does not match cleared error' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_clear_errors_by_type( self, @@ -550,7 +550,7 @@ async def test_clear_errors_by_type( for raised_error in raised_errors_b: assert raised_error in cleared_errors_B, 'Raised errors should be cleared' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_clear_all_errors( self, @@ -597,7 +597,7 @@ async def test_clear_all_errors( assert raised_error in cleared_errors, 'Raised errors should be cleared' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_req_error( self, @@ -626,7 +626,7 @@ async def test_receive_req_error( assert raised_error == error_handling_tester.test_error_handling['errors_all'][0], 'Equal error should be received by all' assert raised_error == error_handling_tester.test_error_handling['errors_global_all'][0], 'Equal error should be received by global all' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_req_error_cleared( self, @@ -660,7 +660,7 @@ async def test_receive_req_error_cleared( assert cleared_error == error_handling_tester.test_error_handling['errors_all'][0], 'Equal error should be received by all' assert cleared_error == error_handling_tester.test_error_handling['errors_global_all'][0], 'Equal error should be received by global all' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_req_not_sub_error( self, @@ -687,7 +687,7 @@ async def test_receive_req_not_sub_error( assert raised_error['severity'] == err_arg['severity'], 'Raised error severity does not match expected error' assert raised_error == error_handling_tester.test_error_handling['errors_global_all'][0], 'Equal error should be received by global all' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_req_not_sub_error_cleared( self, @@ -719,7 +719,7 @@ async def test_receive_req_not_sub_error_cleared( assert cleared_error == error_handling_tester.test_error_handling['errors_global_all'][0], 'Equal error should be received by global all' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_not_req_error( self, @@ -745,7 +745,7 @@ async def test_receive_not_req_error( assert raised_error['message'] == err_arg['message'], 'Raised error message does not match expected error' assert raised_error['severity'] == err_arg['severity'], 'Raised error severity does not match expected error' - @pytest.mark.everest_core_config('config-test-cpp-error-handling.yaml') + @pytest.mark.everest_core_config('everest-core-testing-config-test-cpp-error-handling.yaml') @pytest.mark.asyncio async def test_receive_not_req_error_cleared( self,