Skip to content

Fix the error where the cluster memeber cannot be started in tests. #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2020
Merged

Fix the error where the cluster memeber cannot be started in tests. #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ void shouldNotServeWritesWhenMajorityOfCoresAreDead()
Set<ClusterMember> cores = cluster.cores();
for ( ClusterMember follower : cluster.followers() )
{
cluster.kill( follower );
cluster.stop( follower );
}
awaitLeaderToStepDown( cores );

Expand Down Expand Up @@ -428,7 +428,7 @@ void shouldServeReadsWhenMajorityOfCoresAreDead()
Set<ClusterMember> cores = cluster.cores();
for ( ClusterMember follower : cluster.followers() )
{
cluster.kill( follower );
cluster.stop( follower );
}
awaitLeaderToStepDown( cores );

Expand Down
4 changes: 4 additions & 0 deletions driver/src/test/java/org/neo4j/driver/v1/integration/CredentialsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import java.util.Map;

import org.neo4j.driver.internal.security.InternalAuthToken;
import org.neo4j.driver.internal.util.DisabledOnNeo4jWith;
import org.neo4j.driver.internal.util.Neo4jFeature;
import org.neo4j.driver.v1.AuthToken;
import org.neo4j.driver.v1.AuthTokens;
import org.neo4j.driver.v1.Config;
Expand Down Expand Up @@ -58,6 +60,8 @@ class CredentialsIT
static final DatabaseExtension neo4j = new DatabaseExtension();

@Test
@DisabledOnNeo4jWith( Neo4jFeature.BOLT_V4 )
// This feature is removed in 4.0
void shouldBePossibleToChangePassword() throws Exception
{
String newPassword = "secret";
Expand Down
6 changes: 1 addition & 5 deletions driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,7 @@ private static void waitForMembersToBeOnline( Set<ClusterMember> members, Cluste
try
{
final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
// we will wait until the leader is online
if ( clusterOverview.containsValue( ClusterMemberRole.LEADER ) )
{
actualOnlineAddresses = clusterOverview.keySet();
}
actualOnlineAddresses = clusterOverview.keySet();
}
catch ( Throwable t )
{
Expand Down