You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2021/09/03 08:15:23 UTC
[jackrabbit-oak] branch trunk updated: OAK-9563:
LastRevSingleNodeRecoveryTest fails in setUp()
This is an automated email from the ASF dual-hosted git repository.
mreutegg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 92f4124 OAK-9563: LastRevSingleNodeRecoveryTest fails in setUp()
new 9daa746 Merge pull request #358 from mreutegg/OAK-9563-2
92f4124 is described below
commit 92f4124eb364c14fc229fbe0200d87658148ea1a
Author: Marcel Reutegger <ma...@gmail.com>
AuthorDate: Fri Sep 3 09:23:46 2021 +0200
OAK-9563: LastRevSingleNodeRecoveryTest fails in setUp()
Drop collections before test
Check mk for null in tear down
---
.../oak/plugins/document/LastRevSingleNodeRecoveryTest.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java
index d2064f5..db0ecd0 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LastRevSingleNodeRecoveryTest.java
@@ -91,6 +91,9 @@ public class LastRevSingleNodeRecoveryTest {
@Before
public void setUp() throws InterruptedException {
try {
+ if (fixture instanceof DocumentStoreFixture.MongoFixture) {
+ MongoUtils.dropCollections(MongoUtils.DB);
+ }
mk = createMK(0);
Assume.assumeNotNull(mk);
@@ -230,8 +233,10 @@ public class LastRevSingleNodeRecoveryTest {
public void tearDown() throws Exception {
Revision.resetClockToDefault();
ClusterNodeInfo.resetClockToDefault();
- mk.dispose();
- if ( mk2 != null ) {
+ if (mk != null) {
+ mk.dispose();
+ }
+ if (mk2 != null) {
mk2.dispose();
}
fixture.dispose();