From 7307c20ae780ea6b140ca710a2190bb487b4d937 Mon Sep 17 00:00:00 2001 From: Henrik Wahlqvist Date: Wed, 27 Aug 2025 12:31:26 +0200 Subject: [PATCH] Add test_data to flake8, fixing current issues Change-Id: I25bae588edfe075ba0437a24584c9a14894e1f27 --- .../test_nvm_def/nvm_def_setup.py | 35 +++++++++---------- .../composition_yaml_with_nvm.py | 2 +- .../test_composition_yaml/prepare_for_xml.py | 9 +++-- tox.ini | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/test_data/powertrain_build/test_nvm_def/nvm_def_setup.py b/test_data/powertrain_build/test_nvm_def/nvm_def_setup.py index c6a6d8f..58c79e5 100644 --- a/test_data/powertrain_build/test_nvm_def/nvm_def_setup.py +++ b/test_data/powertrain_build/test_nvm_def/nvm_def_setup.py @@ -10,7 +10,7 @@ nvm_vars_test = { 'configs': ['all'], 'description': 'Enter a nice description of your variable here', 'handle': 'VcAcCtrl/VcAcCtrl/Subsystem/VcAcCtrl/CoolingManager/' - '3_SystemInfo/36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', + '3_SystemInfo/36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -22,13 +22,12 @@ nvm_vars_test = { 'sVcAesHw_X_VntAdpnOffs': { 'VcAesVnt': { 'class': 'CVC_DISP_NVM', - 'configs': ['Vc_Aes_Vnt_B_CodeGenVntGvnr ' - '== 0'], + 'configs': ['Vc_Aes_Vnt_B_CodeGenVntGvnr == 0'], 'description': 'Enter a nice ' - 'description of your ' - 'variable here', + 'description of your ' + 'variable here', 'handle': 'VcAesVnt/VcAesVnt/Subsystem/VcAesVnt/VcAesVnt/1_Vnt/11_VntGvnr/' - '111_VntGvnrExe/1111_VntGvnrFct/11112_VntAdpn/sVcAesHw_X_VntAdpnOffs/Unit Delay', + '111_VntGvnrExe/1111_VntGvnrFct/11112_VntAdpn/sVcAesHw_X_VntAdpnOffs/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -44,10 +43,10 @@ nvm_vars_test = { 'class': 'CVC_DISP_NVM', 'configs': ['all'], 'description': 'Enter a nice ' - 'description of your ' - 'variable here', + 'description of your ' + 'variable here', 'handle': 'VcAesMoAdp/VcAesMoAdp/Subsystem/VcAesMoAdp/VcAesMoAdp/' - '2_ThrArAdpn/sVcAesMo_Ar_NvmThrAdpn/Unit Delay', + '2_ThrArAdpn/sVcAesMo_Ar_NvmThrAdpn/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -63,10 +62,10 @@ nvm_vars_test = { 'class': 'CVC_DISP_NVM', 'configs': ['all'], 'description': 'Enter a nice ' - 'description of your ' - 'variable here', + 'description of your ' + 'variable here', 'handle': 'VcAesMoAdp/VcAesMoAdp/Subsystem/VcAesMoAdp/VcAesMoAdp/' - '2_ThrArAdpn/sVcAesMo_Ar_NvmThrAdpn/Unit Delay', + '2_ThrArAdpn/sVcAesMo_Ar_NvmThrAdpn/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -82,11 +81,11 @@ nvm_vars_test = { 'class': 'CVC_DISP_NVM', 'configs': ['all'], 'description': 'Enter a nice ' - 'description of ' - 'your variable ' - 'here', + 'description of ' + 'your variable ' + 'here', 'handle': 'VcAesMfl/VcAesMfl/Subsystem/VcAesMfl/VcAesMfl/4_Nvm/41_Ld1Ne1/' - 'sVcAesMo_rt_NvmMafLrngLd1Ne1/Unit Delay', + 'sVcAesMo_rt_NvmMafLrngLd1Ne1/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -103,7 +102,7 @@ nvm_vars_test = { 'configs': ['all'], 'description': 'Enter a nice description of your variable here', 'handle': 'VcAcCtrl/VcAcCtrl/Subsystem/VcAcCtrl/CoolingManager/3_SystemInfo/' - '36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', + '36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', @@ -118,7 +117,7 @@ nvm_vars_test = { 'configs': ['all'], 'description': 'Enter a nice description of your variable here', 'handle': 'VcAcCtrl/VcAcCtrl/Subsystem/VcAcCtrl/CoolingManager/3_SystemInfo/' - '36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', + '36_CompressorRunTime/sVcAcCtrl_t_CmprRunTiNVM/Unit Delay', 'lsb': 1, 'max': 'nan', 'min': 'nan', diff --git a/test_data/zone_controller/test_composition_yaml/composition_yaml_with_nvm.py b/test_data/zone_controller/test_composition_yaml/composition_yaml_with_nvm.py index a0ccf19..9714e7f 100644 --- a/test_data/zone_controller/test_composition_yaml/composition_yaml_with_nvm.py +++ b/test_data/zone_controller/test_composition_yaml/composition_yaml_with_nvm.py @@ -170,4 +170,4 @@ expected_result = { }, "PortInterfaces": composition_yaml_setup.base_port_interfaces, "ExternalFiles": composition_yaml_setup.base_configuration -} \ No newline at end of file +} diff --git a/test_data/zone_controller/test_composition_yaml/prepare_for_xml.py b/test_data/zone_controller/test_composition_yaml/prepare_for_xml.py index 4e5085f..5296ec3 100644 --- a/test_data/zone_controller/test_composition_yaml/prepare_for_xml.py +++ b/test_data/zone_controller/test_composition_yaml/prepare_for_xml.py @@ -4,8 +4,13 @@ """Unit test data for powertrain_build.zone_controller.composition_yaml.""" description = "This is a valid description." -illegal_description = "This is a description with 'single' and \"double\" quotes & some XML characters." -fixed_illegal_description = "This is a description with 'single' and "double" quotes & some <illegal> XML characters." +illegal_description = ( + "This is a description with illegal XML characters: 'single' and \"double\" quotes as well as < & >." +) +fixed_illegal_description = ( + "This is a description with illegal XML characters: " + "'single' and "double" quotes as well as < & >." +) long_description = ( "This is a long description that spans multiple lines. \n" "It does not contain any single and double quotes or any other illegal XML characters. \n" diff --git a/tox.ini b/tox.ini index 28ab6d2..eb7c262 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ deps = -rtest-requirements.txt [testenv:flake8] -commands = flake8 powertrain_build tests +commands = flake8 powertrain_build tests test_data [testenv:pytest] commands =