Skip to content

Permit dev agent suffix in tests and update password management #1159

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
Feb 22, 2022
Merged

Permit dev agent suffix in tests and update password management #1159

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
2 changes: 1 addition & 1 deletion driver/src/test/java/org/neo4j/driver/internal/util/Neo4jWithFeatureCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private static ConditionEvaluationResult checkFeatureAvailability( Neo4jFeature
try ( Session session = driver.session() )
{
String agent = session.readTransaction( tx -> tx.run( "RETURN 1" ).consume().server().agent() );
Pattern pattern = Pattern.compile( "^Neo4j/(\\d+)\\.(\\d+)\\.(\\d+)$" );
Pattern pattern = Pattern.compile( "^Neo4j/(\\d+)\\.(\\d+)\\.(\\d+)(-dev)?$" );
Matcher matcher = pattern.matcher( agent );
if ( !matcher.matches() )
{
Expand Down
2 changes: 1 addition & 1 deletion driver/src/test/java/org/neo4j/driver/util/Neo4jRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ private void installNeo4j() throws IOException

moveFile( new File( tempHomeDir ), targetHomeFile );
debug( "Installed server at `%s`.", HOME_DIR );
executeCommand( "neoctrl-create-user", HOME_DIR, USER, PASSWORD );
executeCommand( "neoctrl-set-initial-password", PASSWORD, HOME_DIR );
}
}

Expand Down