From dd153c799b3788491d83dbd8d3a17000e395fcda Mon Sep 17 00:00:00 2001 From: devanshjain Date: Wed, 29 Oct 2025 00:06:25 +0000 Subject: [PATCH] Update dependencies in requirements.txt and clean up unused imports in collector and filesystem_collector modules; enhance tests by removing unnecessary assertions and print statements. --- requirements.txt | 33 +++++++++---------- src/module_utils/collector.py | 1 - src/module_utils/filesystem_collector.py | 6 ---- tests/module_utils/collector_test.py | 3 +- .../module_utils/filesystem_collector_test.py | 9 ++--- .../module_utils/get_pcmk_properties_test.py | 2 -- .../configuration_check_module_test.py | 4 +-- tests/modules/get_azure_lb_test.py | 2 -- 8 files changed, 19 insertions(+), 41 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0c867d1e..010ddca4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ ansible-core==2.17.14 # ansible-lint ansible-lint==25.9.2 # via -r requirements.in -ansible-runner==2.4.1 +ansible-runner==2.4.2 # via -r requirements.in astroid==4.0.1 # via pylint @@ -21,9 +21,7 @@ attrs==25.4.0 # via # jsonschema # referencing -azure-common==1.1.28 - # via azure-mgmt-network -azure-core==1.35.1 +azure-core==1.36.0 # via # azure-identity # azure-kusto-data @@ -47,7 +45,7 @@ azure-mgmt-core==1.6.0 # via # azure-mgmt-compute # azure-mgmt-network -azure-mgmt-network==29.0.0 +azure-mgmt-network==30.0.0 # via -r requirements.in azure-storage-blob==12.23.0 # via @@ -71,17 +69,17 @@ cffi==2.0.0 # via # ansible-lint # cryptography -charset-normalizer==3.4.3 +charset-normalizer==3.4.4 # via requests click==8.3.0 # via # -r requirements.in # black -coverage[toml]==7.10.7 +coverage[toml]==7.11.0 # via # -r requirements.in # pytest-cov -cryptography==46.0.2 +cryptography==46.0.3 # via # ansible-core # ansible-lint @@ -104,11 +102,10 @@ ijson==3.4.0.post0 # via azure-kusto-data importlib-metadata==8.7.0 # via ansible-lint -iniconfig==2.1.0 +iniconfig==2.3.0 # via pytest isodate==0.7.2 # via - # azure-mgmt-network # azure-storage-blob # azure-storage-queue # msrest @@ -144,7 +141,9 @@ msal==1.34.0 msal-extensions==1.3.1 # via azure-identity msrest==0.7.1 - # via azure-mgmt-compute + # via + # azure-mgmt-compute + # azure-mgmt-network mypy-extensions==1.1.0 # via black numpy==2.2.6 @@ -190,7 +189,7 @@ pyjwt[crypto]==2.10.1 # via # msal # pyjwt -pylint==4.0.0 +pylint==4.0.2 # via -r requirements.in pytest==8.4.2 # via @@ -207,7 +206,7 @@ python-dateutil==2.9.0.post0 # via # azure-kusto-data # pandas -pytokens==0.1.10 +pytokens==0.2.0 # via black pytz==2025.2 # via pandas @@ -238,20 +237,18 @@ resolvelib==1.0.1 # via ansible-core rich==14.2.0 # via -r requirements.in -rpds-py==0.27.1 +rpds-py==0.28.0 # via # jsonschema # referencing -ruamel-yaml==0.18.15 +ruamel-yaml==0.18.16 # via ansible-lint ruamel-yaml-clib==0.2.14 # via # ansible-lint # ruamel-yaml six==1.17.0 - # via - # azure-core - # python-dateutil + # via python-dateutil subprocess-tee==0.4.2 # via # ansible-compat diff --git a/src/module_utils/collector.py b/src/module_utils/collector.py index 3363498b..dd9ad030 100644 --- a/src/module_utils/collector.py +++ b/src/module_utils/collector.py @@ -9,7 +9,6 @@ import logging import re import shlex -import ipaddress from typing import Any try: diff --git a/src/module_utils/filesystem_collector.py b/src/module_utils/filesystem_collector.py index 9e7b82aa..34fea506 100644 --- a/src/module_utils/filesystem_collector.py +++ b/src/module_utils/filesystem_collector.py @@ -5,11 +5,7 @@ Collectors for data collection in SAP Automation QA """ import json -from abc import ABC, abstractmethod import logging -import re -import shlex -import ipaddress from typing import Any try: @@ -434,14 +430,12 @@ def gather_all_filesystem_info( fstype = fs.get("fstype", "") stripe_size = fs.get("stripe_size", "") stripes = "" - lv_size = "" if not stripe_size and vg_name and source: for lv_name, lv_info in lvm_volumes.items(): if lv_info.get("dm_path") == source: stripe_size = lv_info.get("stripe_size", "") stripes = lv_info.get("stripes", "") - lv_size = lv_info.get("size", "") self.parent.log( logging.INFO, f"Found LVM details for {target}: " diff --git a/tests/module_utils/collector_test.py b/tests/module_utils/collector_test.py index 99a6ee83..b1836366 100644 --- a/tests/module_utils/collector_test.py +++ b/tests/module_utils/collector_test.py @@ -5,11 +5,10 @@ Unit tests for the collector module. """ +import pytest import json from typing import Any, Dict -from unittest.mock import Mock -import pytest from src.module_utils.collector import ( AzureDataParser, diff --git a/tests/module_utils/filesystem_collector_test.py b/tests/module_utils/filesystem_collector_test.py index 5bcb74c9..03c8efc2 100644 --- a/tests/module_utils/filesystem_collector_test.py +++ b/tests/module_utils/filesystem_collector_test.py @@ -9,13 +9,8 @@ Tests use pytest with monkeypatch for mocking, avoiding unittest entirely. """ -import json -import logging -from typing import Any, Dict, List -from unittest.mock import Mock - import pytest - +from typing import Any, Dict from src.module_utils.filesystem_collector import FileSystemCollector @@ -768,7 +763,7 @@ def test_collect_empty_lvm_fullreport(self, collector, mock_parent): "mount_info": "/data /dev/sdc xfs rw", "df_info": "Filesystem 1K-blocks Used Available Use% Mounted\n/dev/sdc 524288000 52428800 471859200 10% /data", } - result = collector.collect(MockCheck(), context) + collector.collect(MockCheck(), context) assert any( "lvm_fullreport is empty or invalid" in log["message"] for log in mock_parent.logs ) diff --git a/tests/module_utils/get_pcmk_properties_test.py b/tests/module_utils/get_pcmk_properties_test.py index a4d14d86..500a6618 100644 --- a/tests/module_utils/get_pcmk_properties_test.py +++ b/tests/module_utils/get_pcmk_properties_test.py @@ -490,7 +490,5 @@ def test_check_required_resources_optional(self, validator): "meta_attributes": {}, } validator.RESOURCE_CATEGORIES["optional_resource"] = ".//primitive[@type='NonExistent']" - - initial_message = validator.result["message"] validator._check_required_resources() assert "Required resource 'optional_resource'" not in validator.result["message"] diff --git a/tests/modules/configuration_check_module_test.py b/tests/modules/configuration_check_module_test.py index cf184741..e96af367 100644 --- a/tests/modules/configuration_check_module_test.py +++ b/tests/modules/configuration_check_module_test.py @@ -10,10 +10,9 @@ """ import json -import logging from datetime import datetime from typing import Any, Dict, Optional -from unittest.mock import Mock, MagicMock, patch +from unittest.mock import Mock, patch import pytest @@ -698,7 +697,6 @@ def test_get_results_summary_empty(self, config_module): def test_get_results_summary_with_results(self, config_module, sample_check): """Test summary with mixed results""" - # Create mock result objects with status as string values for summary result1 = Mock() result1.status = TestStatus.SUCCESS.value result1.check = sample_check diff --git a/tests/modules/get_azure_lb_test.py b/tests/modules/get_azure_lb_test.py index 5525eeee..6a19859b 100644 --- a/tests/modules/get_azure_lb_test.py +++ b/tests/modules/get_azure_lb_test.py @@ -115,8 +115,6 @@ def test_get_load_balancers_details(self, azure_lb): :type azure_lb: AzureLoadBalancer """ azure_lb.get_load_balancers_details() - print(f"\n\nResult: {azure_lb.result}") - print(f"Parameters: {azure_lb.result['details']['parameters']}") assert azure_lb.result["status"] == "PASSED" assert azure_lb.result["details"]["parameters"] is not None