Skip to content

Commit 31160d3

Browse files
committed
Fixing tests
1 parent a858c85 commit 31160d3

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

nodestream_plugin_neo4j/result.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class Neo4jQueryStatistics:
117117
write_metrics: Neo4jWriteMetrics = field(default_factory=Neo4jWriteMetrics)
118118

119119
# APOC specific metrics
120-
is_apoc_query: bool = False
121120
was_terminated: bool = False
122121
retries: int = 0
123122

@@ -141,7 +140,6 @@ def from_result(
141140

142141
# Handle APOC metrics if present
143142
if apoc_response:
144-
stats.is_apoc_query = True
145143
stats.was_terminated = apoc_response.wasTerminated
146144
stats.retries = apoc_response.retries
147145

tests/unit/test_result.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ def test_neo4j_query_statistics_default_initialization():
9898
assert_that(stats.timing, is_(Neo4jTimingMetrics))
9999
assert_that(stats.write_metrics, not_none())
100100
assert_that(stats.write_metrics, is_(Neo4jWriteMetrics))
101-
assert_that(stats.is_apoc_query, equal_to(False))
102101
assert_that(stats.was_terminated, equal_to(False))
103102
assert_that(stats.retries, equal_to(0))
104103
assert_that(stats.error_messages, empty())
@@ -111,15 +110,13 @@ def test_neo4j_query_statistics_custom_initialization():
111110
stats = Neo4jQueryStatistics(
112111
timing=timing,
113112
write_metrics=write_metrics,
114-
is_apoc_query=True,
115113
was_terminated=True,
116114
retries=2,
117115
error_messages=["error1", "error2"],
118116
)
119117

120118
assert_that(stats.timing, equal_to(timing))
121119
assert_that(stats.write_metrics, equal_to(write_metrics))
122-
assert_that(stats.is_apoc_query, equal_to(True))
123120
assert_that(stats.was_terminated, equal_to(True))
124121
assert_that(stats.retries, equal_to(2))
125122
assert_that(stats.error_messages, equal_to(["error1", "error2"]))
@@ -165,7 +162,6 @@ def test_neo4j_query_statistics_from_result_without_apoc():
165162
assert_that(stats.write_metrics.indexes_added, equal_to(3))
166163
assert_that(stats.write_metrics.indexes_removed, equal_to(1))
167164

168-
assert_that(stats.is_apoc_query, equal_to(False))
169165
assert_that(stats.was_terminated, equal_to(False))
170166
assert_that(stats.retries, equal_to(0))
171167
assert_that(stats.error_messages, empty())
@@ -225,7 +221,6 @@ def test_neo4j_query_statistics_from_result_with_apoc():
225221
assert_that(stats.write_metrics.labels_added, equal_to(5))
226222
assert_that(stats.write_metrics.labels_removed, equal_to(2))
227223

228-
assert_that(stats.is_apoc_query, equal_to(True))
229224
assert_that(stats.was_terminated, equal_to(True))
230225
assert_that(stats.retries, equal_to(2))
231226
assert_that(stats.error_messages, equal_to(["batch1", "batch2"]))
@@ -250,7 +245,6 @@ def test_neo4j_query_statistics_from_result_with_apoc_no_update_stats():
250245

251246
stats = Neo4jQueryStatistics.from_result(mock_summary, apoc_response)
252247

253-
assert_that(stats.is_apoc_query, equal_to(True))
254248
assert_that(stats.was_terminated, equal_to(False))
255249
assert_that(stats.retries, equal_to(1))
256250
assert_that(stats.timing.apoc_time_ms, equal_to(1500))
@@ -312,7 +306,6 @@ def test_neo4j_result_obtain_query_statistics_non_apoc():
312306
assert_that(stats.timing.planning_time_ms, equal_to(30))
313307
assert_that(stats.timing.processing_time_ms, equal_to(70))
314308
assert_that(stats.timing.total_time_ms, equal_to(100))
315-
assert_that(stats.is_apoc_query, equal_to(False))
316309

317310

318311
def test_neo4j_result_obtain_query_statistics_apoc_query(mocker):
@@ -346,35 +339,12 @@ def test_neo4j_result_obtain_query_statistics_apoc_query(mocker):
346339
stats = result.obtain_query_statistics()
347340

348341
assert_that(stats.timing.apoc_time_ms, equal_to(1000))
349-
assert_that(stats.is_apoc_query, equal_to(True))
350342
assert_that(stats.write_metrics.nodes_created, equal_to(5))
351343

352344
# Verify from_dict was called
353345
mock_from_dict.assert_called_once()
354346

355347

356-
def test_neo4j_result_obtain_query_statistics_apoc_query_no_records():
357-
query = Query("CALL apoc.test()", {}, is_apoc=True)
358-
359-
# Mock EagerResult with no records
360-
mock_result = Mock()
361-
mock_result.records = []
362-
mock_result.keys = ["result"]
363-
364-
# Mock summary
365-
mock_summary = Mock()
366-
mock_summary.query_type = "write"
367-
mock_summary.result_available_after = 40
368-
mock_summary.result_consumed_after = 60
369-
mock_result.summary = mock_summary
370-
371-
result = Neo4jResult(query, mock_result)
372-
stats = result.obtain_query_statistics()
373-
374-
# Should still work, just without APOC response
375-
assert_that(stats.is_apoc_query, equal_to(False)) # No APOC response processed
376-
377-
378348
def test_update_metrics_from_summary(mocker):
379349
# Mock the Metrics.get() method
380350
mock_metrics = Mock()

0 commit comments

Comments
 (0)