Bring tests

Author: enolfc

egi_notebooks_accounting/config-tests.ini

@@ -19,3 +19,5 @@ installation_id=test-site
 # add every flavor to be reported as follows
 flava=id_flava
 
+[d4science]
+host=example.com

egi_notebooks_accounting/d4science.py

@@ -58,7 +58,6 @@
 import json
 import logging
 import os
-from datetime import timezone
 
 import escapism
 import requests
@@ -115,31 +114,6 @@ def push_records(self, context, records):
         logging.debug(f"Response: {response.text}")
         response.raise_for_status()
 
-    def update_pod_metric(self, pod, metrics, period_start, period_end):
-        if not pod.flavor or pod.flavor not in self.flavor_config:
-            # cannot report
-            logging.debug(f"Flavor {pod.flavor} does not have a configured metric")
-            return
-        user, group = (pod.global_user_name, pod.fqan)
-        user_metrics = metrics.get((user, group), {})
-        flavor_metric = self.flavor_config[pod.flavor]
-        metrics[(user, group)] = user_metrics
-
-        if pod.start_time is None:
-            report_start_time = period_start
-        else:
-            report_start_time = max(
-                period_start, pod.start_time.replace(tzinfo=timezone.utc)
-            )
-        if pod.end_time is None:
-            report_end_time = period_end
-        else:
-            report_end_time = min(period_end, pod.end_time.replace(tzinfo=timezone.utc))
-        flavor_metric_value = user_metrics.get(flavor_metric, 0)
-        user_metrics[flavor_metric] = (
-            flavor_metric_value + (report_end_time - report_start_time).total_seconds()
-        )
-
     def generate_record(self, pod):
         # minInvocationTime
         # maxInvocationTime

egi_notebooks_accounting/tests/conftest.py

@@ -60,7 +60,7 @@ class TestHelpers:
     FQAN = "tsuite"
 
     @staticmethod
-    def pod(i: int, start_time: datetime, wall: float | None) -> VM:
+    def pod(i: int, start_time: datetime, wall: float | None = None, **kwargs) -> VM:
         """
         Insert pod into local accounting database.
 
@@ -83,7 +83,7 @@ def pod(i: int, start_time: datetime, wall: float | None) -> VM:
             end_time = None
             # long running pod
             wall = 7 * 24 * 3600
-        return VM.create(
+        vm = VM.create(
             local_id=local_id,
             machine=f"machine{i}",
             local_user_id=TestHelpers.LUSER,
@@ -96,3 +96,7 @@ def pod(i: int, start_time: datetime, wall: float | None) -> VM:
             flavor=TestHelpers.flavor_name,
             cpu_duration=0.1 * wall,
         )
+        for k, v in kwargs.items():
+            setattr(vm, k, v)
+        vm.save()
+        return vm

egi_notebooks_accounting/tests/test_d4science.py

@@ -1,9 +1,11 @@
 """Tests for d4science pusher"""
 
-from unittest.mock import patch
+import datetime
+from unittest.mock import call, patch
 
 from .. import d4science
 from .. import recordpusher
+from .conftest import TestHelpers
 
 
 def test_push_records(requests_mock, config_file):
@@ -18,7 +20,84 @@ def test_push_records(requests_mock, config_file):
         m_token.assert_called_with(
             d4science.DEFAULT_TOKEN_URL, "", "", "openid d4s-context:foo"
         )
+    requests_mock
 
 
-def test_go():
-    assert True
+def test_generate_day_metrics(config_file):
+    start_time = datetime.datetime.today()
+    # not finished pod
+    TestHelpers.pod(0, start_time)
+    # finished within the period
+    TestHelpers.pod(1, start_time, 5 * 60)
+    TestHelpers.pod(2, start_time - datetime.timedelta(minutes=2), 10 * 60)
+    TestHelpers.pod(3, start_time + datetime.timedelta(minutes=1), 5 * 60)
+    # finished before the period
+    TestHelpers.pod(4, start_time - datetime.timedelta(days=1), 20 * 60 * 60)
+    with patch.object(d4science.D4ScienceRecordPusher, "push_records") as m_push:
+        with patch.object(d4science.D4ScienceRecordPusher, "generate_record") as m_rec:
+            pusher = d4science.D4ScienceRecordPusher()
+            pusher.configure(config_file)
+            m_rec.side_effect = [{"scope": "foo"}, {"scope": "foo"}, {"scope": "bar"}]
+            pusher.generate_day_metrics(
+                start_time, start_time + datetime.timedelta(days=1)
+            )
+            assert m_push.mock_calls == [
+                call("foo", [{"scope": "foo"}, {"scope": "foo"}]),
+                call("bar", [{"scope": "bar"}]),
+            ]
+
+
+def test_generate_record(config_file):
+    start_time = datetime.datetime.today()
+    start_ts = int(start_time.timestamp() * 1000)
+    pusher = d4science.D4ScienceRecordPusher()
+    pusher.configure(config_file)
+    pod_1 = TestHelpers.pod(
+        0,
+        start_time,
+        100,
+        machine="jupyter-helmi-2esaidib4d4f--rname-2d-52-53tudio-53erver-4fption",
+    )
+    record_1 = pusher.generate_record(pod_1)
+    assert record_1 == {
+        "aggregated": False,
+        "callerQualifier": "TOKEN",
+        "consumerId": "gtuser",
+        "creationTime": start_ts,
+        "duration": 100,
+        "endTime": start_ts + 100 * 1000,
+        "host": "example.com",
+        "id": "00000000-0000-0000-0000-000000000000",
+        "jobName": "00000000-0000-0000-0000-000000000000",
+        "maxInvocationTime": 100,
+        "minInvocationTime": 100,
+        "operationCount": 1,
+        "operationResult": "SUCCESS",
+        "recordType": "JobUsageRecord",
+        "scope": "tsuite",
+        "serviceClass": "RStudio",
+        "serviceName": "Jupyter",
+        "startTime": start_ts,
+    }
+    pod_2 = TestHelpers.pod(1, start_time, 500)
+    record_2 = pusher.generate_record(pod_2)
+    assert record_2 == {
+        "aggregated": False,
+        "callerQualifier": "TOKEN",
+        "consumerId": "gtuser",
+        "creationTime": start_ts,
+        "duration": 500,
+        "endTime": start_ts + 500 * 1000,
+        "host": "example.com",
+        "id": "00000000-0000-0000-0000-000000000001",
+        "jobName": "00000000-0000-0000-0000-000000000001",
+        "maxInvocationTime": 500,
+        "minInvocationTime": 500,
+        "operationCount": 1,
+        "operationResult": "SUCCESS",
+        "recordType": "JobUsageRecord",
+        "scope": "tsuite",
+        "serviceClass": "Jupyter",
+        "serviceName": "Jupyter",
+        "startTime": start_ts,
+    }