Fix tests

Author: mshriver

backend/ibutsu_server/encoder.py

@@ -16,4 +16,7 @@ def default(self, o):
                 mapped_attr = o.attribute_map[attr]
                 dikt[mapped_attr] = value
             return dikt
-        return DefaultJSONProvider.default(self, o)
+        # For basic JSON-serializable types, return as-is
+        if isinstance(o, (dict, list, str, int, float, bool, type(None))):
+            return o
+        return super().default(o)

backend/ibutsu_server/tasks/importers.py

@@ -1,7 +1,7 @@
 import json
 import re
 import tarfile
-from datetime import datetime
+from datetime import datetime, timezone
 from io import BytesIO
 
 from celery.utils.log import get_task_logger
@@ -87,24 +87,24 @@ def _get_ts_element(tree):
 
 def _parse_timestamp(ts):
     """To reduce cognitive complexity"""
-    return parser.parse(ts.get("timestamp")) if ts.get("timestamp") else datetime.utcnow()
+    return parser.parse(ts.get("timestamp")) if ts.get("timestamp") else datetime.now(timezone.utc)
 
 
 def _process_result(result_dict, testcase):
     """To reduce cognitive complexity"""
     skip_reason = traceback = None
-    if testcase.find("failure"):
+    if hasattr(testcase, "failure"):
         result_dict["result"] = "failed"
         traceback = bytes(str(testcase.failure), "utf8")
-    elif testcase.find("error"):
+    elif hasattr(testcase, "error"):
         result_dict["result"] = "error"
         traceback = bytes(str(testcase.error), "utf8")
-    elif testcase.find("skipped"):
+    elif hasattr(testcase, "skipped"):
         result_dict["result"] = "skipped"
         skip_reason = str(testcase.skipped)
-    elif testcase.find("xfailure"):
+    elif hasattr(testcase, "xfailure"):
         result_dict["result"] = "xfailed"
-    elif testcase.find("xpassed"):
+    elif hasattr(testcase, "xpassed"):
         result_dict["result"] = "xpassed"
     else:
         result_dict["result"] = "passed"
@@ -124,7 +124,7 @@ def _add_artifacts(result, testcase, traceback, session):
                 content=traceback,
             )
         )
-    if testcase.find("system-out"):
+    if hasattr(testcase, "system-out"):
         system_out = bytes(str(testcase["system-out"]), "utf8")
         session.add(
             Artifact(
@@ -134,7 +134,7 @@ def _add_artifacts(result, testcase, traceback, session):
                 content=system_out,
             )
         )
-    if testcase.find("system-err"):
+    if hasattr(testcase, "system-err"):
         system_err = bytes(str(testcase["system-err"]), "utf8")
         session.add(
             Artifact(
@@ -191,10 +191,10 @@ def _populate_result_metadata(run_dict, result_dict, metadata):
         result_dict["metadata"].update(metadata)
         result_dict["env"] = run_dict.get("env")
         result_dict["component"] = run_dict.get("component")
-    if metadata.get("project_id"):
-        result_dict["project_id"] = metadata["project_id"]
-    if metadata.get("source"):
-        result_dict["source"] = metadata["source"]
+        if metadata.get("project_id"):
+            result_dict["project_id"] = metadata["project_id"]
+        if metadata.get("source"):
+            result_dict["source"] = metadata["source"]
 
 
 def _get_test_name_path(testcase):
@@ -346,7 +346,7 @@ def run_junit_import(import_):  # noqa: PLR0912
                         content=traceback,
                     )
                 )
-            if testcase.find("system-out"):
+            if hasattr(testcase, "system-out"):
                 system_out = bytes(str(testcase["system-out"]), "utf8")
                 session.add(
                     Artifact(
@@ -356,7 +356,7 @@ def run_junit_import(import_):  # noqa: PLR0912
                         content=system_out,
                     )
                 )
-            if testcase.find("system-err"):
+            if hasattr(testcase, "system-err"):
                 system_err = bytes(str(testcase["system-err"]), "utf8")
                 session.add(
                     Artifact(

backend/ibutsu_server/templates/result.html

@@ -1,4 +1,7 @@
 {{raw_data|safe}}
+{% if duration %}
+<p>Duration: {{duration|pretty_duration}}</p>
+{% endif %}
 <table>
     {% for art in artifacts %}
     <tr><td><a href="/api/artifact/{{art._id}}">{{art.filename}}</a></td></tr>

backend/tests/test_importers.py

@@ -650,54 +650,52 @@ def test_run_junit_import_basic(self, make_import, flask_app):
             </testsuite>
             """
 
-            import_record = make_import(filename="test.xml", format="junit", status="pending")
+        import_record = make_import(filename="test.xml", format="junit", status="pending")
 
-            # Create import file
-            import_file = ImportFile(
-                id=str(uuid4()), import_id=import_record.id, filename="test.xml", content=junit_xml
-            )
-            from ibutsu_server.db.base import session
+        # Create import file
+        import_file = ImportFile(id=str(uuid4()), import_id=import_record.id, content=junit_xml)
+        from ibutsu_server.db.base import session
 
-            session.add(import_file)
-            session.commit()
+        session.add(import_file)
+        session.commit()
 
-            # Run the import
-            run_junit_import({"id": str(import_record.id)})
+        # Run the import
+        run_junit_import({"id": str(import_record.id)})
 
-            # Verify run was created
-            runs = Run.query.all()
-            assert len(runs) > 0
-            run = runs[-1]  # Get the latest run
-            assert run.summary["tests"] == 2
-            assert run.summary["failures"] == 1
+        # Verify run was created
+        runs = Run.query.all()
+        assert len(runs) > 0
+        run = runs[-1]  # Get the latest run
+        assert run.summary["tests"] == 2
+        assert run.summary["failures"] == 1
 
-            # Verify results were created
-            results = Result.query.filter_by(run_id=run.id).order_by(Result.id).all()
-            assert len(results) == 2
+        # Verify results were created
+        results = Result.query.filter_by(run_id=run.id).order_by(Result.id).all()
+        assert len(results) == 2
 
-            # Verify per-test behavior: one passed and one failed result
-            statuses = {r.result for r in results}
-            assert statuses == {"passed", "failed"}
+        # Verify per-test behavior: one passed and one failed result
+        statuses = {r.result for r in results}
+        assert statuses == {"passed", "failed"}
 
-            # Check that test identifiers/names were correctly mapped from the XML
-            test_ids = {r.test_id for r in results}
-            # Test IDs should contain both test case names
-            assert any("test_pass" in tid for tid in test_ids)
-            assert any("test_fail" in tid for tid in test_ids)
+        # Check that test identifiers/names were correctly mapped from the XML
+        test_ids = {r.test_id for r in results}
+        # Test IDs should contain both test case names
+        assert any("test_pass" in tid for tid in test_ids)
+        assert any("test_fail" in tid for tid in test_ids)
 
-            # Verify the failed test has a traceback artifact attached
-            failed_result = next(r for r in results if r.result == "failed")
-            failed_artifacts = Artifact.query.filter_by(result_id=failed_result.id).all()
-            failed_filenames = {a.filename for a in failed_artifacts}
+        # Verify the failed test has a traceback artifact attached
+        failed_result = next(r for r in results if r.result == "failed")
+        failed_artifacts = Artifact.query.filter_by(result_id=failed_result.id).all()
+        failed_filenames = {a.filename for a in failed_artifacts}
 
-            # We expect a traceback artifact for the failed test
-            assert "traceback.log" in failed_filenames
+        # We expect a traceback artifact for the failed test
+        assert "traceback.log" in failed_filenames
 
-            # Verify import status updated
-            from ibutsu_server.db.models import Import
+        # Verify import status updated
+        from ibutsu_server.db.models import Import
 
-            updated_import = Import.query.get(import_record.id)
-            assert updated_import.status == "done"
+        updated_import = Import.query.get(import_record.id)
+        assert updated_import.status == "done"
 
     def test_run_junit_import_with_properties(self, make_import, make_project, flask_app):
         """Test JUnit import with properties"""
@@ -723,9 +721,7 @@ def test_run_junit_import_with_properties(self, make_import, make_project, flask
                 data={"project_id": project.id},
             )
 
-            import_file = ImportFile(
-                id=str(uuid4()), import_id=import_record.id, filename="test.xml", content=junit_xml
-            )
+            import_file = ImportFile(id=str(uuid4()), import_id=import_record.id, content=junit_xml)
             from ibutsu_server.db.base import session
 
             session.add(import_file)
@@ -809,7 +805,6 @@ def test_run_archive_import_basic(self, make_import, flask_app):
             import_file = ImportFile(
                 id=str(uuid4()),
                 import_id=import_record.id,
-                filename="archive.tar.gz",
                 content=tar_content,
             )
             from ibutsu_server.db.base import session
@@ -825,8 +820,8 @@ def test_run_archive_import_basic(self, make_import, flask_app):
             run = Run.query.get(run_id)
             assert run is not None
 
-            # Verify result was created
-            result = Result.query.get(result_id)
+            # Verify result was created (archive import creates new IDs for results)
+            result = Result.query.filter_by(test_id="test.example", run_id=run.id).first()
             assert result is not None
             assert result.test_id == "test.example"