Skip to content

Commit 5c616df

Browse files
authored
test: clean up test table and add logging in test env rule (#2594)
1 parent 6e60c01 commit 5c616df

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableLogicalViewIT.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import io.grpc.StatusRuntimeException;
3636
import java.util.List;
3737
import java.util.logging.Logger;
38+
import org.junit.After;
3839
import org.junit.Before;
3940
import org.junit.BeforeClass;
4041
import org.junit.ClassRule;
@@ -71,6 +72,13 @@ public void setUp() throws InterruptedException {
7172
testTable = createTestTable(testEnvRule.env().getTableAdminClient());
7273
}
7374

75+
@After
76+
public void tearDown() throws InterruptedException {
77+
if (testTable != null) {
78+
testEnvRule.env().getTableAdminClient().deleteTable(testTable.getId());
79+
}
80+
}
81+
7482
@Test
7583
public void createLogicalViewAndGetLogicalViewTest() {
7684
String logicalViewId = prefixGenerator.newPrefix();

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/it/SampleRowsIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ public void testOnAuthorizedView()
104104
.env()
105105
.getTableAdminClient()
106106
.deleteAuthorizedView(testAuthorizedView.getTableId(), testAuthorizedView.getId());
107+
108+
testEnvRule.env().getTableAdminClient().deleteTable(testAuthorizedView.getTableId());
107109
}
108110

109111
private static AuthorizedView createPreSplitTableAndAuthorizedView() {

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/test_helpers/env/TestEnvRule.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,17 @@ void cleanUpStale() throws ExecutionException, InterruptedException, IOException
167167
private void cleanupStaleTables(String stalePrefix) {
168168
for (String tableId : env().getTableAdminClient().listTables()) {
169169
if (!tableId.startsWith(PrefixGenerator.PREFIX)) {
170+
LOGGER.info("Skip cleaning up table: " + tableId);
170171
continue;
171172
}
172173
if (stalePrefix.compareTo(tableId) > 0) {
174+
LOGGER.info("Preparing stale table for delete: " + tableId);
173175
prepTableForDelete(tableId);
174176
try {
177+
LOGGER.info("Deleting stable table: " + tableId);
175178
env().getTableAdminClient().deleteTable(tableId);
176-
} catch (NotFoundException ignored) {
177-
179+
} catch (NotFoundException e) {
180+
LOGGER.log(Level.WARNING, "Deleting stale table failed: " + tableId, e);
178181
}
179182
}
180183
}

0 commit comments

Comments
 (0)