| commit | a5d9a64103e1300f83734ae7a15337d8050cc885 | [log] [tgz] |
|---|---|---|
| author | Edwin Kempin <ekempin@google.com> | Thu Nov 02 13:32:39 2017 +0100 |
| committer | Edwin Kempin <ekempin@google.com> | Fri Nov 03 16:06:24 2017 +0100 |
| tree | 44b3d7167ef781b38ab9698350a83153d793ce30 | |
| parent | 91dc742edb2d86a38685f7126ed483d3a685970b [diff] |
CleanUp after query tests Each test invocation creates a new lifecycle listeners but they are never stopped. Also each test invocation creates a new ReviewDb which is never closed. This contributes to the OutOfMemoryError that happens when LuceneQueryChangesTest is executed on Mac (see issue 7611). However this clean up alone doesn't fix it yet. Bug: Issue 7611 Change-Id: Ib00376ac58c4c952529df034d84d5d9f9089e17c Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java index 2f84a58..62d1df9 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
@@ -129,6 +129,12 @@ setUpDatabase(); } + @After + public void cleanUp() { + lifecycle.stop(); + db.close(); + } + protected void setUpDatabase() throws Exception { db = schemaFactory.open(); schemaCreator.create(db);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 1e722fc..783bd26 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -204,6 +204,12 @@ setUpDatabase(); } + @After + public void cleanUp() { + lifecycle.stop(); + db.close(); + } + protected void setUpDatabase() throws Exception { try (ReviewDb underlyingDb = inMemoryDatabase.getDatabase().open()) { schemaCreator.create(underlyingDb);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java index 1e506ed..e352d8b 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -126,6 +126,12 @@ setUpDatabase(); } + @After + public void cleanUp() { + lifecycle.stop(); + db.close(); + } + protected void setUpDatabase() throws Exception { db = schemaFactory.open(); schemaCreator.create(db);