-
Notifications
You must be signed in to change notification settings - Fork 30
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
[Bc2lkk3N] Fixed testImportCsvTerminate and added TerminationGuard to apoc.import.csv #343
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vga91
force-pushed
the
added-terminationGuard-apoc.import.csv
branch
2 times, most recently
from
March 7, 2023 23:09
ed53a0d
to
82a5d1c
Compare
It currently fails because of this other flaky test: #344 |
vga91
force-pushed
the
added-terminationGuard-apoc.import.csv
branch
from
March 10, 2023 08:33
82a5d1c
to
3f09375
Compare
vga91
force-pushed
the
added-terminationGuard-apoc.import.csv
branch
from
March 16, 2023 08:55
3f09375
to
e159546
Compare
nadja-muller
approved these changes
Apr 4, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable to me
vga91
added a commit
that referenced
this pull request
Apr 12, 2023
… apoc.import.csv (#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Apr 17, 2023
… apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Apr 17, 2023
…ionGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
May 17, 2023
…ionGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Jun 21, 2023
…ionGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Jun 27, 2023
…ionGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo
vga91
added a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Jun 29, 2023
…eo4j/apoc#256) (#3534) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations (neo4j/apoc#256) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations * [HFWBmuq2] Code clean * [HFWBmuq2] removed unused code * [HFWBmuq2] try solving flaky tests * [HFWBmuq2] changes review - added time check * [HFWBmuq2] added local file tests - small changes * [HFWBmuq2] removed unused imports after rebase * [HFWBmuq2] fix flaky transaction not found error * [HFWBmuq2] Fix heapspace and flaky errors * [HFWBmuq2] [Bc2lkk3N] Fixed testImportCsvTerminate and added TerminationGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo * [HFWBmuq2] fix compile error * [HFWBmuq2] remove imports * [HFWBmuq2] fix flaky Timeboxed error * [HFWBmuq2] removed unused imports
BennuFire
pushed a commit
to BennuFire/neo4j-apoc-procedures
that referenced
this pull request
Jul 10, 2023
…eo4j/apoc#256) (neo4j-contrib#3534) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations (neo4j/apoc#256) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations * [HFWBmuq2] Code clean * [HFWBmuq2] removed unused code * [HFWBmuq2] try solving flaky tests * [HFWBmuq2] changes review - added time check * [HFWBmuq2] added local file tests - small changes * [HFWBmuq2] removed unused imports after rebase * [HFWBmuq2] fix flaky transaction not found error * [HFWBmuq2] Fix heapspace and flaky errors * [HFWBmuq2] [Bc2lkk3N] Fixed testImportCsvTerminate and added TerminationGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo * [HFWBmuq2] fix compile error * [HFWBmuq2] remove imports * [HFWBmuq2] fix flaky Timeboxed error * [HFWBmuq2] removed unused imports
BennuFire
pushed a commit
to neo4j-contrib/neo4j-apoc-procedures
that referenced
this pull request
Jul 10, 2023
…eo4j/apoc#256) (#3534) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations (neo4j/apoc#256) * [HFWBmuq2] Fixes neo4j/apoc#155: Check for correct tx terminations * [HFWBmuq2] Code clean * [HFWBmuq2] removed unused code * [HFWBmuq2] try solving flaky tests * [HFWBmuq2] changes review - added time check * [HFWBmuq2] added local file tests - small changes * [HFWBmuq2] removed unused imports after rebase * [HFWBmuq2] fix flaky transaction not found error * [HFWBmuq2] Fix heapspace and flaky errors * [HFWBmuq2] [Bc2lkk3N] Fixed testImportCsvTerminate and added TerminationGuard to apoc.import.csv (neo4j/apoc#343) * [Bc2lkk3N] Fix testImportCsvTerminate and add TerminationGuard to apoc.import.csv * [Bc2lkk3N] Fix failing tests * [Bc2lkk3N] Fix typo * [HFWBmuq2] fix compile error * [HFWBmuq2] remove imports * [HFWBmuq2] fix flaky Timeboxed error * [HFWBmuq2] removed unused imports
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TerminationGuard
toapoc.import.csv
The test didn't fail because it produced a false positive,
since without the TerminationGuard, the procedure complete the whole procedure when the
TERMINATE TRANSACTION <procTransactionId>
is called, but despite this an"Explicitly terminated by the user."
is eventually returned.Therefore, with procedure duration less than the set
db.transaction.timeout
,both with and without the TerminationGuard, the test was green.
Apparently I didn't replicate it because, unlike gh actions and locally,
with teamcity sometimes the procedure lasts more then
timeout
time.So, I added an additional check to
checkTerminationGuard
,to verify that the procedure actually lasts longer than the timeout
and I weighted the
testImportCsvTerminate
.Not strictly card-related (to make the pr green):
TerminationGuard
toapoc.refactor.cloneSubgraph