Skip to content

Commit 1b69237

Browse files
committed
Merge branch 'test_tx_run' into test_tx_func_run
2 parents 051a63f + 151081c commit 1b69237

File tree

3 files changed

+69
-11
lines changed

3 files changed

+69
-11
lines changed

.github/workflows/testkit.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,5 @@ jobs:
6868
6969
- name: Run integration tests
7070
run: |
71-
docker compose up -d --remove-orphans --wait --no-build \
72-
server1 \
73-
server2 \
74-
server3 \
75-
server4 \
76-
testkit_backend
77-
78-
docker compose run --rm testkit ./testkit.sh
71+
docker compose up -d --remove-orphans --wait --no-build testkit_backend neo4j
72+
docker compose up testkit

docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ services:
119119

120120
testkit:
121121
image: python:3.13
122+
command: ./testkit.sh
122123
volumes:
123124
- .:/opt/project
124125
working_dir: /opt/project/testkit-backend
@@ -131,6 +132,9 @@ services:
131132
TEST_DRIVER_NAME: php
132133
TEST_DRIVER_REPO: /opt/project
133134
TEST_BACKEND_HOST: testkit_backend
135+
TEST_STUB_HOST: testkit
136+
depends_on:
137+
- testkit_backend
134138

135139
testkit_backend:
136140
<<: *common-php
@@ -141,7 +145,5 @@ services:
141145
- neo4j
142146
extra_hosts:
143147
- "host.docker.internal:host-gateway"
144-
depends_on:
145-
- neo4j
146148
ports:
147149
- "9876:9876"

testkit-backend/testkit.sh

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,29 @@ echo "Starting tests..."
3939
EXIT_CODE=0
4040
#neo4j
4141
##test_authentication
42-
#python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic|| EXIT_CODE=1
42+
python3 -m unittest tests.neo4j.test_authentication.TestAuthenticationBasic|| EXIT_CODE=1
4343
##
4444
####test_bookmarks
45+
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 || 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
4565
#python3 -m unittest tests.neo4j.test_bookmarks.TestBookmarks || EXIT_CODE=1
4666
##
4767
###test_session_run
@@ -65,6 +85,15 @@ EXIT_CODE=0
6585
##
6686
###test_direct_driver
6787
#### test_direct_driver
88+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
89+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
90+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
91+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_non_existing || EXIT_CODE=1
92+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db || EXIT_CODE=1
93+
python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_multi_db_various_databases|| EXIT_CODE=1
94+
##
95+
###test_summary
96+
python3 -m unittest tests.neo4j.test_summary.TestSummary || EXIT_CODE=1
6897
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_custom_resolver|| EXIT_CODE=1
6998
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_fail_nicely_when_using_http_port|| EXIT_CODE=1
7099
#python3 -m unittest tests.neo4j.test_direct_driver.TestDirectDriver.test_supports_multi_db|| EXIT_CODE=1
@@ -75,6 +104,39 @@ EXIT_CODE=0
75104
##test_summary // done
76105
#python3 -m unittest tests.neo4j.test_summary.TestSummary
77106

107+
####stub
108+
####test-basic-query
109+
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_path_element_ids_with_string || EXIT_CODE=1
110+
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_node_element_id_with_id || EXIT_CODE=1
111+
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_5x0_populates_node_element_id_with_string || EXIT_CODE=1
112+
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_rel_element_id_with_id || EXIT_CODE=1
113+
python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long || EXIT_CODE=1
114+
115+
##test_tx_run
116+
#tx_run
117+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1
118+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_commit_transaction || EXIT_CODE=1
119+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_can_rollback_transaction || EXIT_CODE=1
120+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_updates_last_bookmark_on_commit || EXIT_CODE=1
121+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_rollback || EXIT_CODE=1
122+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_does_not_update_last_bookmark_on_failure || EXIT_CODE=1
123+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_be_able_to_rollback_a_failure || EXIT_CODE=1
124+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_failure || EXIT_CODE=1
125+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_rollbacked_tx || EXIT_CODE=1
126+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_rollback_a_commited_tx || EXIT_CODE=1
127+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_commit_a_commited_tx || EXIT_CODE=1
128+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_commited_tx || EXIT_CODE=1
129+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_allow_run_on_a_rollbacked_tx || EXIT_CODE=1
130+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_not_run_valid_query_in_invalid_tx || EXIT_CODE=1
131+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_commited_tx || EXIT_CODE=1
132+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_run_in_a_rollbacked_tx || EXIT_CODE=1
133+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_should_fail_to_run_query_for_invalid_bookmark || EXIT_CODE=1
134+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_broken_transaction_should_not_break_session || EXIT_CODE=1
135+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_tx_configuration || EXIT_CODE=1
136+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_consume_after_commit || EXIT_CODE=1
137+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_parallel_queries || EXIT_CODE=1
138+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_interwoven_queries || EXIT_CODE=1
139+
python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_unconsumed_result || EXIT_CODE=1
78140
###test_tx_run
79141
##tx_run //done
80142
#python3 -m unittest tests.neo4j.test_tx_run.TestTxRun.test_simple_query || EXIT_CODE=1

0 commit comments

Comments
 (0)