more fixups

Author: himdel

metrics_utility/library/collectors/others/total_workers_vcpu.py

@@ -25,7 +25,7 @@ def total_workers_vcpu(*, cluster_name=None, metering_enabled=False, prometheus_
 
     if not metering_enabled:
         info['total_workers_vcpu'] = 1
-        return info
+        return output.dict(info)
 
     prom = PrometheusClient(url=prometheus_url, ca_cert_path=ca_cert_path, token=token)
 

metrics_utility/test/gather/test_jobhostsummary_gather.py

@@ -285,7 +285,7 @@ def test_job_host_summary_case_insensitive_disable(cleanup_glob):
 def test_job_host_summary_invalid_values_still_enabled(cleanup_glob):
     """Test that job_host_summary.csv is still generated when METRICS_UTILITY_DISABLE_JOB_HOST_SUMMARY_COLLECTOR is set to invalid values."""
 
-    invalid_values = ['yes', 'no', '1', '0', 'enabled', 'disabled', 'random_text', '']
+    invalid_values = ['yes', 'no', '0', 'enabled', 'disabled', 'random_text', '']
 
     for test_value in invalid_values:
         # Create environment variables with collector set to invalid value

metrics_utility/test/gather/test_total_workers_vcpu.py

@@ -1,6 +1,5 @@
-
 from datetime import datetime, timezone
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, mock_open, patch
 
 import pytest
 
@@ -64,11 +63,10 @@ def test_raises_exception_when_total_workers_vcpu_is_none(self):
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
             patch('metrics_utility.automation_controller_billing.collectors.total_workers_vcpu') as mock_tw_vcpu,
-            patch('metrics_utility.automation_controller_billing.collectors.os.path.exists') as mock_exists,
-            patch('builtins.open', MagicMock(return_value=MagicMock(__enter__=MagicMock(return_value=MagicMock(read=MagicMock(return_value='test-token\n')))))),
+            patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
+            patch('builtins.open', mock_open(read_data='test-token\n')),
         ):
             mock_get.return_value = ['total_workers_vcpu']
-            mock_exists.return_value = True  # token and ca_cert files exist
 
             # Mock the collector to return None for total_workers_vcpu
             mock_collector = MagicMock()
@@ -91,11 +89,10 @@ def test_successful_call_with_metering_enabled(self):
         with (
             patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors') as mock_get,
             patch('metrics_utility.automation_controller_billing.collectors.total_workers_vcpu') as mock_tw_vcpu,
-            patch('metrics_utility.automation_controller_billing.collectors.os.path.exists') as mock_exists,
-            patch('builtins.open', MagicMock(return_value=MagicMock(__enter__=MagicMock(return_value=MagicMock(read=MagicMock(return_value='test-token\n')))))),
+            patch('metrics_utility.automation_controller_billing.collectors.os.path.exists', return_value=True),
+            patch('builtins.open', mock_open(read_data='test-token\n')),
         ):
             mock_get.return_value = ['total_workers_vcpu']
-            mock_exists.return_value = True  # token and ca_cert files exist
 
             # Mock the collector
             mock_collector = MagicMock()

metrics_utility/test/library/test_collectors_total_workers_vcpu_helpers.py

@@ -150,9 +150,7 @@ def test_get_cpu_timeline_query_parameters(self):
 
         get_cpu_timeline(mock_prom, start_ts, end_ts)
 
-        mock_prom.query_range.assert_called_once_with(
-            query='sum(machine_cpu_cores)', start_time=start_ts, end_time=end_ts, step='5m'
-        )
+        mock_prom.query_range.assert_called_once_with(query='sum(machine_cpu_cores)', start_time=start_ts, end_time=end_ts, step='5m')
 
     def test_get_cpu_timeline_empty_result(self):
         """Test handling of empty result."""

metrics_utility/test/test_collectors.py

@@ -53,7 +53,13 @@ def test_main_indirectmanagednodeaudit_table_not_in_optional_collectors(self, mo
     @patch('metrics_utility.automation_controller_billing.collectors.main_indirectmanagednodeaudit')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     @patch('metrics_utility.automation_controller_billing.collectors.connection')
-    def test_main_indirectmanagednodeaudit_table_programming_error(self, mock_connection, mock_get_optional_collectors, mock_main_indirectmanagednodeaudit, mock_logger):
+    def test_main_indirectmanagednodeaudit_table_programming_error(
+        self,
+        mock_connection,
+        mock_get_optional_collectors,
+        mock_main_indirectmanagednodeaudit,
+        mock_logger,
+    ):
         """Test graceful handling when table doesn't exist (ProgrammingError)"""
         # Setup
         mock_get_optional_collectors.return_value = {'main_indirectmanagednodeaudit'}
@@ -80,7 +86,13 @@ def test_main_indirectmanagednodeaudit_table_programming_error(self, mock_connec
     @patch('metrics_utility.automation_controller_billing.collectors.main_indirectmanagednodeaudit')
     @patch('metrics_utility.automation_controller_billing.collectors.get_optional_collectors')
     @patch('metrics_utility.automation_controller_billing.collectors.connection')
-    def test_main_indirectmanagednodeaudit_table_logs_specific_error(self, mock_connection, mock_get_optional_collectors, mock_main_indirectmanagednodeaudit, mock_logger):
+    def test_main_indirectmanagednodeaudit_table_logs_specific_error(
+        self,
+        mock_connection,
+        mock_get_optional_collectors,
+        mock_main_indirectmanagednodeaudit,
+        mock_logger,
+    ):
         """Test that the specific error message is logged correctly"""
         # Setup
         mock_get_optional_collectors.return_value = {'main_indirectmanagednodeaudit'}