Skip to content

Commit 5c86cb8

Browse files
p123-stackp123-stack
committed
fixed test_session_run
1 parent b8b1cf0 commit 5c86cb8

File tree

3 files changed

+51
-45
lines changed

3 files changed

+51
-45
lines changed

‎src/Bolt/BoltConnection.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
use Laudis\Neo4j\Contracts\ConnectionInterface;
3030
use Laudis\Neo4j\Databags\BookmarkHolder;
3131
use Laudis\Neo4j\Databags\DatabaseInfo;
32+
use Laudis\Neo4j\Databags\Neo4jError;
3233
use Laudis\Neo4j\Enum\AccessMode;
3334
use Laudis\Neo4j\Enum\ConnectionProtocol;
3435
use Laudis\Neo4j\Exception\Neo4jException;
@@ -387,8 +388,12 @@ public function assertNoFailure(Response $response): void
387388
{
388389
if ($response->signature === Signature::FAILURE) {
389390
$this->logger?->log(LogLevel::ERROR, 'FAILURE');
391+
$message = $this->messageFactory->createResetMessage();
392+
$resetResponse = $message->send()->getResponse();
390393
$this->subscribedResults = [];
391-
394+
if ($resetResponse->signature === Signature::FAILURE) {
395+
throw new Neo4jException([Neo4jError::fromBoltResponse($resetResponse), Neo4jError::fromBoltResponse($response)]);
396+
}
392397
throw Neo4jException::fromBoltResponse($response);
393398
}
394399
}

‎src/Types/CypherList.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ public function __construct(iterable|callable $iterable = [], ?int $qid = null)
6767
};
6868
}
6969

70+
public function getQid(): ?int
71+
{
72+
return $this->qid;
73+
}
74+
7075
/**
7176
* @template Value
7277
*
@@ -427,9 +432,4 @@ public function each(callable $callable): self
427432

428433
return $this;
429434
}
430-
431-
public function getQid(): ?int
432-
{
433-
return $this->qid;
434-
}
435435
}

‎testkit-backend/testkit.sh‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,29 @@ EXIT_CODE=0
4141
#test_authentication
4242
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic|| EXIT_CODE=1
4343

44-
####test_bookmarks
44+
#test_bookmarks
4545
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || EXIT_CODE=1
46-
#
47-
##test_session_run
48-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size
49-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node
50-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship
51-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_path
52-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_metadata
53-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_in_parameter
54-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_inline
55-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_larger_than_fetch_size
56-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_partial_iteration
57-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_simple_query
58-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_session_reuse
59-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested
60-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_invalid_query
61-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_updates_last_bookmark
62-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_bad_syntax
63-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter
64-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string
65-
#
66-
##test_direct_driver
67-
#
46+
47+
#test_session_run
48+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size || EXIT_CODE=1
49+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node || EXIT_CODE=1
50+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship || EXIT_CODE=1
51+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_path || EXIT_CODE=1
52+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_metadata || EXIT_CODE=1
53+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_in_parameter || EXIT_CODE=1
54+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_inline || EXIT_CODE=1
55+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_larger_than_fetch_size || EXIT_CODE=1
56+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_partial_iteration || EXIT_CODE=1
57+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_simple_query || EXIT_CODE=1
58+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_session_reuse || EXIT_CODE=1
59+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested || EXIT_CODE=1
60+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_invalid_query || EXIT_CODE=1
61+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_updates_last_bookmark || EXIT_CODE=1
62+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_bad_syntax || EXIT_CODE=1
63+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter || EXIT_CODE=1
64+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string || EXIT_CODE=1
65+
66+
#test_direct_driver
6867
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
6968
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
7069
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
@@ -75,7 +74,8 @@ python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_d
7574
#test_summary
7675
python3 -m unittest tests.neo4j.test_summary.TestSummary
7776

78-
#test_tx_run
77+
78+
##test_tx_run
7979
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1
8080
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
8181
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
@@ -100,19 +100,20 @@ python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries ||
100100
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_interwoven_queries || EXIT_CODE=1
101101
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
102102

103-
#test_tx_func_run
104-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_simple_query
105-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_parameter
106-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_meta_data
107-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_iteration_nested
108-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_updates_last_bookmark_on_commit
109-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_does_not_update_last_bookmark_on_rollback
110-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_client_exception_rolls_back_change
111-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_func_configuration
112-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout
103+
104+
##test_tx_func_run
105+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_simple_query || EXIT_CODE=1
106+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_parameter || EXIT_CODE=1
107+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_meta_data || EXIT_CODE=1
108+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_iteration_nested || EXIT_CODE=1
109+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
110+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
111+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_client_exception_rolls_back_change || EXIT_CODE=1
112+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_func_configuration || EXIT_CODE=1
113+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout || EXIT_CODE=1
113114

114115
##stub
115-
#test-basic-query
116+
##test-basic-query
116117
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string || EXIT_CODE=1
117118
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id || EXIT_CODE=1
118119
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string || EXIT_CODE=1
@@ -121,10 +122,10 @@ python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_
121122

122123

123124
#test-session-run
124-
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result
125-
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result
126-
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_no_discard_on_session_close_finished_result
127-
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_raises_error_on_session_run
125+
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result || EXIT_CODE=1
126+
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result || EXIT_CODE=1
127+
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_no_discard_on_session_close_finished_result || EXIT_CODE=1
128+
python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_raises_error_on_session_run || EXIT_CODE=1
128129

129130

130131
exit $EXIT_CODE

0 commit comments

Comments
 (0)