Skip to content

Commit 5d99f82

Browse files
p123-stackp123-stack
committed
fixed the failed testkit
1 parent d002a07 commit 5d99f82

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

‎src/Bolt/BoltConnection.php‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,30 @@ public function __destruct()
325325

326326
public function close(): void
327327
{
328-
if ($this->isOpen()) {
329-
if ($this->isStreaming() && (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false))) {
330-
$this->discardUnconsumedResults();
331-
}
332-
333-
if (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false)) {
334-
$message = $this->messageFactory->createGoodbyeMessage();
335-
$message->send();
328+
try {
329+
if ($this->isOpen()) {
330+
if ($this->isStreaming() && (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false))) {
331+
$this->discardUnconsumedResults();
332+
}
333+
334+
if (($this->connectionUsed['reader'] ?? false) || ($this->connectionUsed['writer'] ?? false)) {
335+
try {
336+
$message = $this->messageFactory->createGoodbyeMessage();
337+
$message->send();
338+
} catch (Throwable $e) {
339+
$this->logger?->log(LogLevel::DEBUG, 'Failed to send GOODBYE message during connection close', [
340+
'error' => $e->getMessage(),
341+
'connection' => $this->getServerAddress()->__toString()
342+
]);
343+
}
344+
}
345+
346+
unset($this->boltProtocol);
336347
}
337-
338-
unset($this->boltProtocol);
348+
} catch (Throwable $e) {
349+
$this->logger?->log(LogLevel::DEBUG, 'Error during connection close', [
350+
'error' => $e->getMessage()
351+
]);
339352
}
340353
}
341354

‎testkit-backend/testkit.sh‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ pip install -r requirements.txt
3737
echo "Starting tests..."
3838

3939
EXIT_CODE=0
40-
##neo4j
40+
41+
#neo4j
4142
#test_authentication
4243
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic|| EXIT_CODE=1
43-
44-
#test_bookmarks
44+
#
45+
###test_bookmarks
4546
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_obtain_bookmark_after_commit || EXIT_CODE=1
4647
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_pass_bookmark_into_next_session || EXIT_CODE=1
4748
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_no_bookmark_after_rollback || EXIT_CODE=1
@@ -51,7 +52,7 @@ python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_handle_mul
5152
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks.test_can_pass_write_bookmark_into_write_session || EXIT_CODE=1
5253

5354

54-
#test_session_run
55+
##test_session_run
5556
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size || EXIT_CODE=1
5657
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node || EXIT_CODE=1
5758
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship || EXIT_CODE=1
@@ -71,18 +72,18 @@ python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_mi
7172
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string || EXIT_CODE=1
7273

7374

74-
#test_direct_driver
75+
####test_direct_driver
7576
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
7677
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
7778
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
7879
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing || EXIT_CODE=1
7980
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db || EXIT_CODE=1
8081
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
8182

82-
#test_summary
83+
###test_summary
8384
python3 -m unittest tests.neo4j.test_summary.TestSummary
8485

85-
#test_tx_run
86+
###test_tx_run
8687
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1
8788
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
8889
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
@@ -106,7 +107,7 @@ python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit
106107
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
107108
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
108109

109-
#test_tx_func_run
110+
###test_tx_func_run
110111
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_simple_query || EXIT_CODE=1
111112
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_parameter || EXIT_CODE=1
112113
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_meta_data || EXIT_CODE=1
@@ -116,36 +117,36 @@ python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_does_not_upd
116117
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_client_exception_rolls_back_change || EXIT_CODE=1
117118
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_func_configuration || EXIT_CODE=1
118119
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout || EXIT_CODE=1
119-
120-
##stub
121-
#test-basic-query
120+
#
121+
###stub
122+
###test-basic-query
122123
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string || EXIT_CODE=1
123124
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id || EXIT_CODE=1
124125
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string || EXIT_CODE=1
125126
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id || EXIT_CODE=1
126127
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long || EXIT_CODE=1
127128

128-
#test-session-run
129+
###test-session-run
129130
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result || EXIT_CODE=1
130131
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result || EXIT_CODE=1
131132
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_no_discard_on_session_close_finished_result || EXIT_CODE=1
132133
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_raises_error_on_session_run || EXIT_CODE=1
133134
#
134-
#TestBookmarksV5
135+
##TestBookmarksV5
135136
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_bookmarks_can_be_set || EXIT_CODE=1
136137
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_last_bookmark || EXIT_CODE=1
137138
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_bookmarks_write_tx || EXIT_CODE=1
138139
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_sequence_of_writing_and_reading_tx || EXIT_CODE=1
139140
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_multiple_bookmarks_write_tx || EXIT_CODE=1
140141

141-
#TestBookmarksV4
142+
##TestBookmarksV4
142143
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_on_unused_sessions_are_returned || EXIT_CODE=1
143144
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_session_run || EXIT_CODE=1
144145
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_sequence_of_writing_and_reading_tx || EXIT_CODE=1
145146
python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run || EXIT_CODE=1
146147

147-
#connectivity_check
148-
##get_server_info
148+
##connectivity_check
149+
###get_server_info
149150
python3 -m unittest tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_direct_no_server
150151
python3 -m unittest tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_direct_raises_error
151152
python3 -m unittest tests.stub.connectivity_check.test_get_server_info.TestGetServerInfo.test_direct || EXIT_CODE=1

0 commit comments

Comments
 (0)