Skip to content

Commit 9b16a76

Browse files
authored
Re-enabling skipped tests (#704)
Some tests were disabled for different reasons, the objective of this PR is to re-enable some skipped tests. This PR re-enable tests related to: - ROUTE message receiving the bookmarks - HELLO message receiving the initial address in the routing context - Routing tests which were skipped because of the lack of result consumption and wrong try_count verification
1 parent bac3980 commit 9b16a76

File tree

2 files changed

+38
-58
lines changed

2 files changed

+38
-58
lines changed

testkit-backend/src/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ class Backend {
8383
const id = this._context.addError(e)
8484
this._writeResponse('DriverError', {
8585
id,
86-
msg: e.message + ' (' + e.code + ')'
86+
msg: e.message + ' (' + e.code + ')',
87+
code: e.code
8788
})
8889
return
8990
}

testkit-backend/src/skipped-tests.js

Lines changed: 36 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,25 @@ function or () {
1414
return testName => [...arguments].find(predicate => predicate(testName))
1515
}
1616

17-
function skip (reason, predicate) {
18-
return { reason, predicate }
17+
function skip (reason, ...predicate) {
18+
return { reason, predicate: or(...predicate) }
1919
}
2020

2121
const skippedTests = [
2222
skip(
23-
'Routing tests are disabled until the fix on the test scenario be merged',
24-
or(ifStartsWith('stub.routing'), ifStartsWith('stub.retry.TestRetry'))
25-
),
26-
skip(
27-
'The driver no support domain_name_resolver',
28-
ifEndsWith('test_should_successfully_acquire_rt_when_router_ip_changes')
23+
'The driver has no support domain_name_resolver',
24+
ifEndsWith('test_should_successfully_acquire_rt_when_router_ip_changes'),
25+
ifEndsWith(
26+
'test_should_request_rt_from_all_initial_routers_until_successful'
27+
)
2928
),
3029
skip(
31-
'Driver is failing trying to update the routing table using the original routing server',
30+
'Driver is start to run tx_function before have a valid connection in hands',
31+
ifEndsWith(
32+
'test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function'
33+
),
3234
ifEndsWith(
33-
'test_should_use_initial_router_for_discovery_when_others_unavailable'
35+
'test_should_retry_write_until_success_with_leader_change_using_tx_function'
3436
)
3537
),
3638
skip(
@@ -40,64 +42,41 @@ const skippedTests = [
4042
)
4143
),
4244
skip(
43-
'Driver should implement resolver',
44-
or(
45-
ifEndsWith(
46-
'test_should_revert_to_initial_router_if_known_router_throws_protocol_errors'
47-
),
48-
ifEndsWith(
49-
'test_should_use_resolver_during_rediscovery_when_existing_routers_fail'
50-
)
45+
'Fails when runned with the full suite',
46+
ifEndsWith(
47+
'.test_should_revert_to_initial_router_if_known_router_throws_protocol_errors'
5148
)
5249
),
5350
skip(
54-
'Test are not consuming the values inside the try catch',
55-
or(
56-
ifEndsWith('test_should_retry_read_tx_and_rediscovery_until_success'),
57-
ifEndsWith('test_should_retry_write_tx_and_rediscovery_until_success'),
58-
ifEndsWith('test_should_retry_write_tx_until_success'),
59-
ifEndsWith(
60-
'test_should_read_successfully_from_reachable_db_after_trying_unreachable_db'
61-
),
62-
ifEndsWith(
63-
'test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function'
64-
)
65-
)
51+
'It could not guarantee the order of records requests between in the nested transactions',
52+
ifEquals('stub.iteration.TxRun.test_nested')
6653
),
6754
skip(
68-
'Requires investigation',
69-
or(
70-
ifEndsWith(
71-
'test_should_fail_when_writing_without_explicit_consumption_on_writer_that_returns_not_a_leader_code'
72-
),
73-
ifEndsWith(
74-
'test_should_fail_when_writing_on_unexpectedly_interrupting_writer_using_session_run'
75-
),
76-
ifEndsWith(
77-
'test_should_fail_with_routing_failure_on_db_not_found_discovery_failure'
78-
),
79-
ifEndsWith(
80-
'test_should_retry_write_until_success_with_leader_change_using_tx_function'
81-
),
82-
ifEndsWith(
83-
'test_should_request_rt_from_all_initial_routers_until_successful'
84-
),
85-
ifEndsWith('test_should_pass_bookmark_from_tx_to_tx_using_tx_run'),
86-
ifEndsWith('test_should_successfully_get_routing_table_with_context'),
87-
ifStartsWith('stub.transport.Transport')
88-
)
55+
'Keeps retrying on commit despite connection being dropped',
56+
ifEquals('stub.retry.TestRetry.test_disconnect_on_commit')
8957
),
9058
skip(
91-
'Should implement result.consume',
92-
ifEquals('neo4j.sessionrun.TestSessionRun.test_updates_last_bookmark')
59+
'Wait clarification about verifyConnectivity behaviour when no reader connection is available',
60+
ifEndsWith(
61+
'.test_should_use_initial_router_for_discovery_when_others_unavailable'
62+
),
63+
ifEndsWith('.test_should_successfully_get_routing_table_with_context')
9364
),
9465
skip(
95-
'It could not guarantee the order of records requests between in the nested transactions',
96-
ifEquals('stub.iteration.TxRun.test_nested')
66+
'Driver is executing the second tx for the same session in a diferent server',
67+
ifEndsWith('test_should_pass_bookmark_from_tx_to_tx_using_tx_run')
9768
),
9869
skip(
99-
'Keeps retrying on commit despite connection being dropped',
100-
ifEquals('stub.retry.TestRetry.test_disconnect_on_commit')
70+
'Driver resolves the address during the record fetch',
71+
ifEndsWith(
72+
'test_should_use_resolver_during_rediscovery_when_existing_routers_fail'
73+
)
74+
),
75+
skip(
76+
'Needs investigation. It is only failing in the RoutingV3 case',
77+
ifEndsWith(
78+
'RoutingV3.test_should_accept_routing_table_without_writers_and_then_rediscover'
79+
)
10180
)
10281
]
10382

0 commit comments

Comments
 (0)