Skip to content

Commit e0a4f6e

Browse files
authored
Enable unexpected interruption routing Testkit tests for reactive backend (#1004)
1 parent e22c944 commit e0a4f6e

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import reactor.core.publisher.Mono;
2727

2828
import java.util.Arrays;
29-
import java.util.Collections;
3029
import java.util.HashSet;
3130
import java.util.Set;
3231
import java.util.concurrent.CompletableFuture;
@@ -38,18 +37,19 @@ public class GetFeatures implements TestkitRequest
3837
{
3938
private static final Set<String> COMMON_FEATURES = new HashSet<>( Arrays.asList(
4039
"AuthorizationExpiredTreatment",
41-
"Optimization:PullPipelining",
4240
"ConfHint:connection.recv_timeout_seconds",
4341
"Temporary:DriverFetchSize",
4442
"Temporary:DriverMaxTxRetryTime"
4543
) );
4644

4745
private static final Set<String> SYNC_FEATURES = new HashSet<>( Arrays.asList(
46+
"Optimization:PullPipelining",
4847
"Temporary:TransactionClose",
4948
"Temporary:ResultList"
5049
) );
5150

52-
private static final Set<String> ASYNC_FEATURES = new HashSet<>( Collections.singletonList(
51+
private static final Set<String> ASYNC_FEATURES = new HashSet<>( Arrays.asList(
52+
"Optimization:PullPipelining",
5353
"Temporary:ResultList"
5454
) );
5555

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,17 @@ public class StartTest implements TestkitRequest
6363
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestDisconnects\\.test_disconnect_on_tx_run$", skipMessage );
6464
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestRetry\\..*$", "Unfinished results consumption" );
6565
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestRetryClustering\\..*$", "Unfinished results consumption" );
66-
skipMessage = "Does not support PULL pipelining";
67-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_read_tx_and_rediscovery_until_success$", skipMessage );
68-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_read_tx_until_success_on_error$", skipMessage );
69-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_write_tx_and_rediscovery_until_success$", skipMessage );
70-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_write_tx_until_success_on_error$", skipMessage );
71-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_fail_when_reading_from_unexpectedly_interrupting_reader_using_session_run$",
72-
skipMessage );
73-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_fail_when_reading_from_unexpectedly_interrupting_reader_using_tx_run$",
74-
skipMessage );
75-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_fail_when_writing_on_unexpectedly_interrupting_writer_using_session_run$",
76-
skipMessage );
77-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_fail_when_reading_from_unexpectedly_interrupting_readers_using_tx_function$",
78-
skipMessage );
79-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_fail_when_writing_to_unexpectedly_interrupting_writers_using_tx_function$",
80-
skipMessage );
81-
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_write_until_success_with_leader_change_using_tx_function$",
82-
skipMessage );
8366
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestSessionRun\\.test_discard_on_session_close_unfinished_result$",
8467
"Does not support partially consumed state" );
8568
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.NoRouting[^.]+\\.test_should_error_on_database_shutdown_using_tx_run$", "Session close throws error" );
8669
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.Routing[^.]+\\.test_should_retry_write_until_success_with_leader_shutdown_during_tx_using_tx_function$",
8770
"Commit failure leaks outside function" );
71+
REACTIVE_SKIP_PATTERN_TO_REASON.put(
72+
"^.*\\.Routing[^.]+\\.test_should_fail_when_reading_from_unexpectedly_interrupting_readers_on_run_using_tx_function$",
73+
"Rollback failures following commit failure" );
74+
REACTIVE_SKIP_PATTERN_TO_REASON.put(
75+
"^.*\\.Routing[^.]+\\.test_should_fail_when_writing_to_unexpectedly_interrupting_writers_on_run_using_tx_function$",
76+
"Rollback failures following commit failure" );
8877
skipMessage = "Requires investigation";
8978
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestProtocolVersions\\.test_server_agent", skipMessage );
9079
REACTIVE_SKIP_PATTERN_TO_REASON.put( "^.*\\.TestProtocolVersions\\.test_server_version", skipMessage );

0 commit comments

Comments
 (0)