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.

Sign up for GitHub

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

Fix DLP inspect tests to fail on timeout #3049

Merged
merged 1 commit into from
Jun 4, 2020
Merged

Fix DLP inspect tests to fail on timeout #3049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 8 additions & 40 deletions dlp/src/test/java/dlp/snippets/InspectTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
import com.google.cloud.dlp.v2.DlpServiceClient;
import com.google.privacy.dlp.v2.CancelDlpJobRequest;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -146,60 +144,30 @@ public void testInspectImageFile() {
}

@Test
public void testInspectGcsFile() throws InterruptedException, ExecutionException, IOException {

public void testInspectGcsFile() throws Exception {
sushicw marked this conversation as resolved.
Show resolved Hide resolved
InspectGcsFile.inspectGcsFile(PROJECT_ID, GCS_PATH, TOPIC_ID, SUBSCRIPTION_ID);
// Await job creation
TimeUnit.SECONDS.sleep(3);

String output = bout.toString();
assertThat(output, containsString("Job created: "));

// Cancelling the job early to conserve quota
String jobId = output.split("Job created: ")[1].split("\n")[0];
CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
try (DlpServiceClient client = DlpServiceClient.create()) {
client.cancelDlpJob(request);
}
assertThat(output, containsString("Job status: DONE"));
}

@Test
public void testInspectDatastoreEntity()
throws InterruptedException, ExecutionException, IOException {
public void testInspectDatastoreEntity() throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you reduce the throws here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


InspectDatastoreEntity.insepctDatastoreEntity(
PROJECT_ID, datastoreNamespace, datastoreKind, TOPIC_ID, SUBSCRIPTION_ID);
// Await job creation
TimeUnit.SECONDS.sleep(3);

String output = bout.toString();
assertThat(output, containsString("Job created: "));

// Cancelling the job early to conserve quota
String jobId = output.split("Job created: ")[1].split("\n")[0];
CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
try (DlpServiceClient client = DlpServiceClient.create()) {
client.cancelDlpJob(request);
}
assertThat(output, containsString("Job status: DONE"));
}

@Test
public void testInspectBigQueryTable()
throws InterruptedException, ExecutionException, IOException {
public void testInspectBigQueryTable() throws Exception {

InspectBigQueryTable.inspectBigQueryTable(
PROJECT_ID, DATASET_ID, TABLE_ID, TOPIC_ID, SUBSCRIPTION_ID);
// Await job creation
TimeUnit.SECONDS.sleep(3);
InspectBigQueryTable
.inspectBigQueryTable(PROJECT_ID, DATASET_ID, TABLE_ID, TOPIC_ID, SUBSCRIPTION_ID);

String output = bout.toString();
assertThat(output, containsString("Job created: "));

// Cancelling the job early to conserve quota
String jobId = output.split("Job created: ")[1].split("\n")[0];
CancelDlpJobRequest request = CancelDlpJobRequest.newBuilder().setName(jobId).build();
try (DlpServiceClient client = DlpServiceClient.create()) {
client.cancelDlpJob(request);
}
assertThat(output, containsString("Job status: DONE"));
}
}