From 82cf4825dd0bddf7c74c39e5f711111a482b12de Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 25 Mar 2025 15:29:08 +0000 Subject: [PATCH 1/4] Update DNS test description --- modules/test/dns/python/src/dns_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/test/dns/python/src/dns_module.py b/modules/test/dns/python/src/dns_module.py index 20ee7617d..7c23102d3 100644 --- a/modules/test/dns/python/src/dns_module.py +++ b/modules/test/dns/python/src/dns_module.py @@ -269,8 +269,8 @@ def _dns_network_from_dhcp(self): LOGGER.info('DNS traffic detected only to configured DHCP DNS server') description = 'DNS traffic detected only to DHCP provided server' else: - LOGGER.info('No DNS traffic detected from the device') - description = 'No DNS traffic detected from the device' + LOGGER.info('No DNS traffic detected from the device to the DHCP DNS server') + description = 'No DNS traffic detected from the device to the DHCP DNS server' return 'Informational', description def _dns_network_hostname_resolution(self): From 72f092ec561d33927be231f44f75657ff6955b3b Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 25 Mar 2025 15:41:34 +0000 Subject: [PATCH 2/4] Fix pylint issue --- modules/test/dns/python/src/dns_module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/test/dns/python/src/dns_module.py b/modules/test/dns/python/src/dns_module.py index 7c23102d3..fc735d002 100644 --- a/modules/test/dns/python/src/dns_module.py +++ b/modules/test/dns/python/src/dns_module.py @@ -269,8 +269,10 @@ def _dns_network_from_dhcp(self): LOGGER.info('DNS traffic detected only to configured DHCP DNS server') description = 'DNS traffic detected only to DHCP provided server' else: - LOGGER.info('No DNS traffic detected from the device to the DHCP DNS server') - description = 'No DNS traffic detected from the device to the DHCP DNS server' + LOGGER.info( + 'No DNS traffic detected from the device to the DHCP DNS server') + description = '' \ + 'No DNS traffic detected from the device to the DHCP DNS server' return 'Informational', description def _dns_network_hostname_resolution(self): From a8d9699711a5e7242676cdb713d56efae51be436 Mon Sep 17 00:00:00 2001 From: Jacob Boddey Date: Tue, 25 Mar 2025 15:42:31 +0000 Subject: [PATCH 3/4] Update Jinja2 version --- framework/requirements.txt | 2 +- modules/test/base/python/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/requirements.txt b/framework/requirements.txt index b5726aca2..543b8ff5e 100644 --- a/framework/requirements.txt +++ b/framework/requirements.txt @@ -41,5 +41,5 @@ paho-mqtt==2.1.0 APScheduler==3.10.4 # Requirements for reports generation -Jinja2==3.1.5 +Jinja2==3.1.6 beautifulsoup4==4.12.3 diff --git a/modules/test/base/python/requirements.txt b/modules/test/base/python/requirements.txt index 5faa12fc8..0a40a660d 100644 --- a/modules/test/base/python/requirements.txt +++ b/modules/test/base/python/requirements.txt @@ -9,4 +9,4 @@ grpcio-tools==1.67.1 netifaces==0.11.0 # Requirements for reports generation -Jinja2==3.1.5 +Jinja2==3.1.6 From be06aadf5677f07ea94fc8c79f30a6363603c252 Mon Sep 17 00:00:00 2001 From: MariusBaldovin Date: Wed, 26 Mar 2025 10:41:06 +0000 Subject: [PATCH 4/4] fix unit test --- testing/unit/dns/dns_module_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/unit/dns/dns_module_test.py b/testing/unit/dns/dns_module_test.py index 97b45d7d5..1ad85942a 100644 --- a/testing/unit/dns/dns_module_test.py +++ b/testing/unit/dns/dns_module_test.py @@ -179,7 +179,8 @@ def dns_no_dns_traffic_test(self): result = dns_module.dns_network_from_dhcp() # Assign the expected test result - description = 'No DNS traffic detected from the device' + description =''\ + 'No DNS traffic detected from the device to the DHCP DNS server' expected_result = ('Informational', description) # Assert that the actual result matches the expected result.