Skip to content

Commit 3f30f62

Browse files
committed
fixup! feat: Change queries to use lab column information
Signed-off-by: Alan Peixinho <alan.peixinho@profusion.mobi>
1 parent 9d19fe1 commit 3f30f62

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

backend/kernelCI_app/queries/build.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import json
12
from typing import Optional
23

3-
from django.db import connection
4+
from django.db import connections
45
from querybuilder.query import Query
56

67
from kernelCI_app.helpers.database import dict_fetchall
@@ -67,6 +68,11 @@ def get_build_tests(build_id: str) -> Optional[list[dict]]:
6768
LEFT JOIN labs ON tests.lab_id = labs.id
6869
WHERE tests.build_id = %s
6970
"""
70-
with connection.cursor() as cursor:
71+
with connections["default"].cursor() as cursor:
7172
cursor.execute(query, [build_id])
72-
return dict_fetchall(cursor)
73+
rows = dict_fetchall(cursor)
74+
75+
for row in rows:
76+
if isinstance(row["environment_misc"], str):
77+
row["environment_misc"] = json.loads(row["environment_misc"])
78+
return rows

backend/kernelCI_app/tests/unitTests/queries/build_test.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def test_get_build_details_empty_result(self, mock_query_class):
2525

2626

2727
class TestGetBuildTests:
28-
@patch("kernelCI_app.queries.build.connection")
29-
def test_get_build_tests_success(self, mock_connection):
30-
mock_cursor = mock_connection.cursor.return_value.__enter__.return_value
28+
@patch("kernelCI_app.queries.build.connections")
29+
def test_get_build_tests_success(self, mock_connections):
30+
mock_cursor = mock_connections.__getitem__.return_value.cursor.return_value.__enter__.return_value
3131
mock_cursor.fetchall.return_value = [
3232
(
3333
"test",
@@ -70,9 +70,9 @@ def test_get_build_tests_success(self, mock_connection):
7070
]
7171
mock_cursor.execute.assert_called_once()
7272

73-
@patch("kernelCI_app.queries.build.connection")
74-
def test_get_build_tests_empty_result(self, mock_connection):
75-
mock_cursor = mock_connection.cursor.return_value.__enter__.return_value
73+
@patch("kernelCI_app.queries.build.connections")
74+
def test_get_build_tests_empty_result(self, mock_connections):
75+
mock_cursor = mock_connections.__getitem__.return_value.cursor.return_value.__enter__.return_value
7676
mock_cursor.fetchall.return_value = []
7777
mock_cursor.description = []
7878

0 commit comments

Comments
 (0)