Update tests to work with setting interval_minutes

Author: naved001

openshift_metrics/tests/conftest.py

@@ -59,6 +59,7 @@ def mock_metrics_file1():
         "cluster_name": "ocp-prod",
         "start_date": "2025-09-20",
         "end_date": "2025-09-20",
+        "interval_minutes": "15",
         "cpu_metrics": cpu_metrics,
         "memory_metrics": memory_metrics,
     }
@@ -124,4 +125,19 @@ def mock_metrics_file2():
         "end_date": "2025-09-21",
         "cpu_metrics": cpu_metrics,
         "memory_metrics": memory_metrics,
+        "interval_minutes": "15",
+    }
+
+
+@pytest.fixture
+def mock_metrics_file3():
+    cpu_metrics = []
+    memory_metrics = []
+    return {
+        "cluster_name": "ocp-prod",
+        "start_date": "2025-09-21",
+        "end_date": "2025-09-21",
+        "interval_minutes": "3",  # file1 and file2 have 15 minutes
+        "cpu_metrics": cpu_metrics,
+        "memory_metrics": memory_metrics,
     }

openshift_metrics/tests/test_merge.py

@@ -70,7 +70,7 @@ def test_load_and_merge_data(tmp_path, mock_metrics_file1, mock_metrics_file2):
     p1.write_text(json.dumps(mock_metrics_file1))
     p2.write_text(json.dumps(mock_metrics_file2))
 
-    processor = load_and_merge_metrics([p1, p2])
+    processor = load_and_merge_metrics(2, [p1, p2])
 
     pod1_metrics = processor.merged_data["namespace1"]["pod1"]["metrics"]
 
@@ -96,3 +96,16 @@ def test_load_metadata(tmp_path, mock_metrics_file1, mock_metrics_file2):
     assert metadata.cluster_name == "ocp-prod"
     assert metadata.report_start_date == "2025-09-20"
     assert metadata.report_end_date == "2025-09-21"
+    assert metadata.interval_minutes == "15"
+
+
+def test_load_metadata_failure(tmp_path, mock_metrics_file2, mock_metrics_file3):
+    """Test that loading metadata fails when files have different interval_minutes."""
+
+    p2 = tmp_path / "file2.json"
+    p3 = tmp_path / "file3.json"
+    p2.write_text(json.dumps(mock_metrics_file2))
+    p3.write_text(json.dumps(mock_metrics_file3))
+
+    with pytest.raises(SystemExit):
+        load_metadata([p2, p3])