Skip to content

Flaky test fix #1490

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

Merged
merged 9 commits into from
Jun 25, 2019
Merged

Flaky test fix #1490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df77f82
Rework the tests to remove flakiness (hopefully)
nnegrey Jun 24, 2019
7e5b550
Merge branch 'master' into flaky-test-fix
nnegrey Jun 24, 2019
b8c453b
Merge branch 'master' into flaky-test-fix
nnegrey Jun 25, 2019
661de12
Update IDs since old test deleted my knowledge base
nnegrey Jun 25, 2019
b406f30
Merge branch 'flaky-test-fix' of https://github.com/GoogleCloudPlatfo…
nnegrey Jun 25, 2019
b6e3633
Update GCS links to fix permission denied errors
nnegrey Jun 25, 2019
c180bbc
Merge branch 'master' into flaky-test-fix
nnegrey Jun 25, 2019
93ce2f9
Use declared var
nnegrey Jun 25, 2019
9a6f221
Merge branch 'master' into flaky-test-fix
nnegrey Jun 25, 2019
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
3 changes: 2 additions & 1 deletion video/beta/src/test/java/com/example/video/DetectIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ public void testTrackObjects() throws Exception {

@Test
public void testTrackObjectsGcs() throws Exception {
VideoAnnotationResults result = TrackObjects.trackObjectsGcs("gs://demomaker/cat.mp4");
VideoAnnotationResults result = TrackObjects.trackObjectsGcs(
"gs://cloud-samples-data/video/cat.mp4");

boolean textExists = false;
for (ObjectTrackingAnnotation objectTrackingAnnotation : result.getObjectAnnotationsList()) {
Expand Down
8 changes: 4 additions & 4 deletions video/cloud-client/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ After you have authorized, you can analyze videos.

Detect Labels
```
mvn exec:java -DDetect -Dexec.args="labels gs://demomaker/cat.mp4"
mvn exec:java -DDetect -Dexec.args="labels gs://cloud-samples-data/video/cat.mp4"

mvn exec:java -DDetect -Dexec.args="labels-file ./resources/cat.mp4"
```

Detect Explicit content annotations
```
mvn exec:java -DDetect -Dexec.args="explicit-content gs://demomaker/gbikes_dinosaur.mp4"
mvn exec:java -DDetect -Dexec.args="explicit-content gs://cloud-samples-data/video/gbikes_dinosaur.mp4"
```

Detect Shots
```
mvn exec:java -DDetect -Dexec.args="shots gs://demomaker/gbikes_dinosaur.mp4"
mvn exec:java -DDetect -Dexec.args="shots gs://cloud-samples-data/video/gbikes_dinosaur.mp4"
```

Transcribe Speech
Expand All @@ -60,7 +60,7 @@ mvn exec:java -DDetect -Dexec.args="speech-transcription gs://python-docs-sample

From Windows, you may need to supply your classpath differently, for example:
```
mvn exec:java -DDetect -Dexec.args="labels gs://demomaker/cat.mp4"
mvn exec:java -DDetect -Dexec.args="labels gs://cloud-samples-data/video/cat.mp4"
```
or
```
Expand Down
2 changes: 1 addition & 1 deletion video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
// Instantiate a video intelligence client
try (VideoIntelligenceServiceClient client = VideoIntelligenceServiceClient.create()) {
// The Google Cloud Storage path to the video to annotate.
String gcsUri = "gs://demomaker/cat.mp4";
String gcsUri = "gs://cloud-samples-data/video/cat.mp4";

// Create an operation that will contain the response when the operation completes.
AnnotateVideoRequest request = AnnotateVideoRequest.newBuilder()
Expand Down
10 changes: 5 additions & 5 deletions video/cloud-client/src/test/java/com/example/video/DetectIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public class DetectIT {
private ByteArrayOutputStream bout;
private PrintStream out;

static final String LABEL_GCS_LOCATION = "gs://demomaker/cat.mp4";
static final String LABEL_GCS_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
static final String LABEL_FILE_LOCATION = "./resources/cat.mp4";
static final String SHOTS_FILE_LOCATION = "gs://demomaker/gbikes_dinosaur.mp4";
static final String EXPLICIT_CONTENT_LOCATION = "gs://demomaker/cat.mp4";
static final String SHOTS_FILE_LOCATION = "gs://cloud-samples-data/video/gbikes_dinosaur.mp4";
static final String EXPLICIT_CONTENT_LOCATION = "gs://cloud-samples-data/video/cat.mp4";
static final String SPEECH_GCS_LOCATION =
"gs://java-docs-samples-testing/video/googlework_short.mp4";
private static final List<String> POSSIBLE_TEXTS = Arrays.asList(
Expand Down Expand Up @@ -106,7 +106,7 @@ public void testSpeechTranscription() throws Exception {

@Test
public void testTrackObjects() throws Exception {
VideoAnnotationResults result = TrackObjects.trackObjects("resources/cat.mp4");
VideoAnnotationResults result = TrackObjects.trackObjects(LABEL_FILE_LOCATION);

boolean textExists = false;
for (ObjectTrackingAnnotation objectTrackingAnnotation : result.getObjectAnnotationsList()) {
Expand All @@ -121,7 +121,7 @@ public void testTrackObjects() throws Exception {

@Test
public void testTrackObjectsGcs() throws Exception {
VideoAnnotationResults result = TrackObjects.trackObjectsGcs("gs://demomaker/cat.mp4");
VideoAnnotationResults result = TrackObjects.trackObjectsGcs(LABEL_GCS_LOCATION);

boolean textExists = false;
for (ObjectTrackingAnnotation objectTrackingAnnotation : result.getObjectAnnotationsList()) {
Expand Down