Skip to content
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.

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

[x2fDvuKu] extend timeout for flaky BigGraphTest #504

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 core/src/test/java/apoc/export/BigGraphTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void testTerminateRenameNodeProp() {

@Test
public void testTerminateRenameType() {
checkTerminationGuard(db, "CALL apoc.refactor.rename.type('DIRECTED', 'DIRECTED_TWO')");
checkTerminationGuard(db, 50L, "CALL apoc.refactor.rename.type('DIRECTED', 'DIRECTED_TWO')");
}

@Test
Expand Down
8 changes: 5 additions & 3 deletions test-utils/src/main/java/apoc/util/TransactionTestUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ public static void lastTransactionChecks(GraphDatabaseService db, String query,
}

public static void checkTransactionTime(long timeout, long timePassed) {
timePassed = (System.currentTimeMillis() - timePassed) / 1000;
assertTrue("The transaction hasn't been terminated before the timeout time, but after " + timePassed + " seconds",
timePassed <= timeout);
double timePassedDouble = (System.currentTimeMillis() - timePassed) / 1000.0;

assertTrue("The transaction hasn't been terminated before the given timeout time (" + timeout
+ "), but after " + timePassedDouble + " seconds",
timePassedDouble <= timeout);
}

public static void checkTransactionNotInList(GraphDatabaseService db, String query) {
Expand Down