Skip to content

Commit b5386d1

Browse files
committed
ruff fixes
1 parent 68fdc49 commit b5386d1

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

tests/database/test_db.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from unittest.mock import Mock, patch, MagicMock, call, mock_open
44

55
import apsw
6-
import logging
76

87
from nettacker.api.helpers import structure
98
from nettacker.database.db import (
@@ -791,13 +790,13 @@ def test_find_events_sqlalchemy(self, mock_create_conn):
791790
mock_row2 = Mock()
792791
mock_row1.json_event = '{"event": "scan started"}'
793792
mock_row2.json_event = '{"event": "port open"}'
794-
mock_session.query.return_value.filter.return_value.all.return_value = [mock_row1, mock_row2]
793+
mock_session.query.return_value.filter.return_value.all.return_value = [
794+
mock_row1,
795+
mock_row2,
796+
]
795797

796798
result = find_events("192.168.1.1", "http", "scan_123")
797-
assert result == [
798-
'{"event": "scan started"}',
799-
'{"event": "port open"}'
800-
]
799+
assert result == ['{"event": "scan started"}', '{"event": "port open"}']
801800

802801
mock_session.query.assert_called_once()
803802
mock_session.query.return_value.filter.return_value.all.assert_called_once()
@@ -852,7 +851,6 @@ def test_select_reports_sqlite_exception(self, mock_create_conn, mock_warn):
852851
assert result == structure(status="error", msg="database error!")
853852
mock_warn.assert_called_once_with("Could not retrieve report...")
854853

855-
856854
@patch("nettacker.database.db.create_connection")
857855
def test_select_reports_sqlalchemy(self, mock_create_conn):
858856
mock_session = Mock()
@@ -865,17 +863,20 @@ def test_select_reports_sqlalchemy(self, mock_create_conn):
865863
mock_report.report_path_filename = "/tmp/report.json"
866864
mock_report.options = json.dumps({"target": "192.168.1.1"})
867865

868-
mock_session.query.return_value.order_by.return_value.offset.return_value.limit.return_value = [mock_report]
866+
mock_session.query.return_value.order_by.return_value.offset.return_value.limit.return_value = [
867+
mock_report
868+
]
869869
result = select_reports(self.page)
870870

871-
assert result == [{
872-
"id": 1,
873-
"date": "2024-01-01",
874-
"scan_id": "scan_123",
875-
"report_path_filename": "/tmp/report.json",
876-
"options": {"target": "192.168.1.1"}
877-
}]
878-
871+
assert result == [
872+
{
873+
"id": 1,
874+
"date": "2024-01-01",
875+
"scan_id": "scan_123",
876+
"report_path_filename": "/tmp/report.json",
877+
"options": {"target": "192.168.1.1"},
878+
}
879+
]
879880

880881
@patch("nettacker.database.db.create_connection")
881882
def test_select_reports_sqlalchemy_exception(self, mock_create_conn):
@@ -884,6 +885,7 @@ def test_select_reports_sqlalchemy_exception(self, mock_create_conn):
884885
mock_session.query.side_effect = Exception("DB Error")
885886
result = select_reports(self.page)
886887
assert result == structure(status="error", msg="database error!")
888+
887889
# -------------------------------------------------------
888890
# tests for get_scan_result
889891
# -------------------------------------------------------
@@ -931,6 +933,7 @@ def test_get_scan_result_sqlalchemy(self, mock_open_builtin, mock_create_conn):
931933
assert content == b"mock file content"
932934

933935
mock_open_builtin.assert_called_once_with("/tmp/mock_report.json", "rb")
936+
934937
# -------------------------------------------------------
935938
# tests for last_host_logs
936939
# -------------------------------------------------------

0 commit comments

Comments
 (0)