Skip to content

Commit 1b35a06

Browse files
p123-stackp123-stack
committed
fixed testkit tests
1 parent a253f56 commit 1b35a06

File tree

4 files changed

+13
-75
lines changed

4 files changed

+13
-75
lines changed

‎docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ services:
5353
- .env
5454
neo4j:
5555
<<: *common
56-
image: neo4j:5.23-community
56+
image: neo4j:5-enterprise
5757
hostname: neo4j
5858
networks:
5959
- neo4j
@@ -62,6 +62,7 @@ services:
6262
- "11474:7474"
6363
environment:
6464
<<: *common-env
65+
NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'
6566
NEO4J_server_bolt_advertised__address: neo4j:7687
6667
NEO4J_server_http_advertised__address: neo4j:7474
6768

‎src/Databags/TransactionConfiguration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
final class TransactionConfiguration
2222
{
23-
public const DEFAULT_TIMEOUT = 60.0;
23+
public const DEFAULT_TIMEOUT = 60 * 60 * 24;
2424
public const DEFAULT_METADATA = '[]';
2525

2626
/**

‎testkit-backend/src/Socket.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public static function fromAddressAndPort(string $address, int $port): self
7878
{
7979
$bind = 'tcp://'.$address.':'.$port;
8080
$streamSocketServer = stream_socket_server($bind, $errorNumber, $errorString);
81+
stream_set_timeout($streamSocketServer, 60 * 60 * 24);
8182
if ($streamSocketServer === false) {
8283
throw new RuntimeException('stream_socket_server() failed: reason: '.$errorNumber.':'.$errorString);
8384
}

‎testkit-backend/testkit.sh‎

Lines changed: 9 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ TESTKIT_VERSION=5.0
55
[ -z "$TEST_NEO4J_HOST" ] && export TEST_NEO4J_HOST=neo4j
66
[ -z "$TEST_NEO4J_USER" ] && export TEST_NEO4J_USER=neo4j
77
[ -z "$TEST_NEO4J_PASS" ] && export TEST_NEO4J_PASS=testtest
8-
[ -z "$TEST_NEO4J_VERSION" ] && export TEST_NEO4J_VERSION=5.23
8+
[ -z "$TEST_NEO4J_VERSION" ] && export TEST_NEO4J_VERSION=5.26
99
[ -z "$TEST_DRIVER_NAME" ] && export TEST_DRIVER_NAME=php
10+
[ -z "$TEST_DEBUG_NO_BACKEND_TIMEOUT" ] && export TEST_DEBUG_NO_BACKEND_TIMEOUT=1
1011

1112
[ -z "$TEST_DRIVER_REPO" ] && TEST_DRIVER_REPO=$(realpath ..) && export TEST_DRIVER_REPO
1213

@@ -34,78 +35,13 @@ pip install -r requirements.txt
3435
# python3 main.py --tests UNIT_TESTS
3536

3637
echo "Starting tests..."
37-
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic || EXIT_CODE=1
38-
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || EXIT_CODE=1
3938

40-
# This test is still failing so we skip it
41-
# python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_timeouttest_autocommit_transactions_should_support_timeout|| EXIT_CODE=1
42-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_smaller_than_fetch_size
43-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_node
44-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_relationship
45-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_can_return_path
46-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_autocommit_transactions_should_support_metadata
47-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_in_parameter
48-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_regex_inline
49-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_larger_than_fetch_size
50-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_partial_iteration
51-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_simple_query
52-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_session_reuse
53-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_iteration_nested
54-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_invalid_query
55-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_recover_from_fail_on_streaming
56-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_updates_last_bookmark
57-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_bad_syntax
58-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_fails_on_missing_parameter
59-
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun.test_long_string
60-
61-
## test_direct_driver
62-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
63-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
64-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
65-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db|| EXIT_CODE=1
66-
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
67-
68-
#test_summary
69-
python3 -m unittest tests.neo4j.test_summary.TestSummary || EXIT_CODE=1
70-
71-
#test_tx_run
72-
##This test is still failing so we skip it test_tx_run
73-
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_timeout || EXIT_CODE=1
74-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_be_able_to_rollback_a_failure || EXIT_CODE=1
75-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_failure || EXIT_CODE=1
76-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1
77-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
78-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
79-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
80-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
81-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_failure || EXIT_CODE=1
82-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_rollbacked_tx || EXIT_CODE=1
83-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_commited_tx || EXIT_CODE=1
84-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_commited_tx || EXIT_CODE=1
85-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_commited_tx || EXIT_CODE=1
86-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_rollbacked_tx || EXIT_CODE=1
87-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_run_valid_query_in_invalid_tx || EXIT_CODE=1
88-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_commited_tx || EXIT_CODE=1
89-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_rollbacked_tx || EXIT_CODE=1
90-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_to_run_query_for_invalid_bookmark || EXIT_CODE=1
91-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_broken_transaction_should_not_break_session || EXIT_CODE=1
92-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1
93-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit || EXIT_CODE=1
94-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
95-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_interwoven_queries || EXIT_CODE=1
96-
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
97-
98-
99-
#test_tx_run
100-
##This test is still failing so we skip it test_tx_func_run
101-
#python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_timeout || EXIT_CODE=1
102-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_simple_query || EXIT_CODE=1
103-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_parameter || EXIT_CODE=1
104-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_meta_data || EXIT_CODE=1
105-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_iteration_nested || EXIT_CODE=1
106-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
107-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
108-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_client_exception_rolls_back_change || EXIT_CODE=1
109-
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun.test_tx_func_configuration || EXIT_CODE=1
39+
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic
40+
python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks
41+
python3 -m unittest tests.neo4j.test_session_run.TestSessionRun
42+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver
43+
python3 -m unittest tests.neo4j.test_summary.TestSummary
44+
python3 -m unittest tests.neo4j.test_tx_func_run.TestTxFuncRun
45+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun
11046

11147

0 commit comments

Comments
 (0)