Skip to content

Commit 59d445d

Browse files
irataxyirataxy
authored
fix: Create job from preset test does not have enough time to complete (GoogleCloudPlatform#4617) (GoogleCloudPlatform#4620)
* (feat) add Transcoder samples * (feat) add Transcoder samples * (feat) lint fix * Address feedback * Add UUIDs to bucket and job template names for tests * Update pom file * Update pom file * Update test duration to fix flaky test * Update deps and change env var. * Update test durations due to flakiness.
1 parent 89aeaee commit 59d445d

11 files changed

Lines changed: 14 additions & 15 deletions

‎.kokoro/tests/run_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ "$SCRIPT_DEBUG" != "true" ]]; then
5555

5656
# Setup required env variables
5757
export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
58-
export GOOGLE_CLOUD_PROJECT_NUMBER="779844219229" # For Transcoder samples
58+
export TRANSCODER_PROJECT_NUMBER="779844219229" # For Transcoder samples
5959
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-acct.json
6060
# For Tasks samples
6161
export QUEUE_ID=my-appengine-queue

‎media/transcoder/src/test/java/com/example/transcoder/CreateJobFromAdHocTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private static void deleteBucket(String bucketName) {
8585
public static void checkRequirements() {
8686
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8787
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
88-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
88+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
8989
}
9090

9191
@Before
@@ -122,7 +122,7 @@ public void test_CreateJobFromAdHoc() throws Exception {
122122
JOB_ID = arr[arr.length - 1].replace("\n", "");
123123
bout.reset();
124124

125-
Thread.sleep(60000);
125+
Thread.sleep(90000);
126126

127127
GetJobState.getJobState(PROJECT_ID, LOCATION, JOB_ID);
128128
output = bout.toString();

‎media/transcoder/src/test/java/com/example/transcoder/CreateJobFromPresetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static void deleteBucket(String bucketName) {
8787
public static void checkRequirements() {
8888
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8989
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
90-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
90+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
9191
}
9292

9393
@Before
@@ -125,7 +125,7 @@ public void test_CreateJobFromPreset() throws Exception {
125125
JOB_ID = arr[arr.length - 1].replace("\n", "");
126126
bout.reset();
127127

128-
Thread.sleep(60000);
128+
Thread.sleep(90000);
129129

130130
GetJobState.getJobState(PROJECT_ID, LOCATION, JOB_ID);
131131
output = bout.toString();

‎media/transcoder/src/test/java/com/example/transcoder/CreateJobFromTemplateTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static void deleteBucket(String bucketName) {
8888
public static void checkRequirements() {
8989
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
9090
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
91-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
91+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
9292
}
9393

9494
@Before
@@ -129,7 +129,7 @@ public void test_CreateJobFromTemplate() throws Exception {
129129
JOB_ID = arr[arr.length - 1].replace("\n", "");
130130
bout.reset();
131131

132-
Thread.sleep(60000);
132+
Thread.sleep(90000);
133133

134134
GetJobState.getJobState(PROJECT_ID, LOCATION, JOB_ID);
135135
output = bout.toString();

‎media/transcoder/src/test/java/com/example/transcoder/CreateJobTemplateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static String requireEnvVar(String varName) {
5555
public static void checkRequirements() {
5656
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
5757
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
58-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
58+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
5959
}
6060

6161
@Before

‎media/transcoder/src/test/java/com/example/transcoder/DeleteJobTemplateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private static String requireEnvVar(String varName) {
5353
public static void checkRequirements() {
5454
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
5555
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
56-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
56+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
5757
}
5858

5959
@Before

‎media/transcoder/src/test/java/com/example/transcoder/DeleteJobTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private static void deleteBucket(String bucketName) {
8585
public static void checkRequirements() {
8686
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8787
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
88-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
88+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
8989
}
9090

9191
@Before

‎media/transcoder/src/test/java/com/example/transcoder/GetJobTemplateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private static String requireEnvVar(String varName) {
5454
public static void checkRequirements() {
5555
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
5656
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
57-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
57+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
5858
}
5959

6060
@Before

‎media/transcoder/src/test/java/com/example/transcoder/GetJobTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.example.transcoder;
1818

19-
2019
import static org.hamcrest.CoreMatchers.containsString;
2120
import static org.hamcrest.MatcherAssert.assertThat;
2221
import static org.junit.Assert.assertNotNull;
@@ -86,7 +85,7 @@ private static void deleteBucket(String bucketName) {
8685
public static void checkRequirements() {
8786
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
8887
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
89-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
88+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
9089
}
9190

9291
@Before

‎media/transcoder/src/test/java/com/example/transcoder/ListJobTemplateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private static String requireEnvVar(String varName) {
5454
public static void checkRequirements() {
5555
requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
5656
PROJECT_ID = requireEnvVar("GOOGLE_CLOUD_PROJECT");
57-
PROJECT_NUMBER = requireEnvVar("GOOGLE_CLOUD_PROJECT_NUMBER");
57+
PROJECT_NUMBER = requireEnvVar("TRANSCODER_PROJECT_NUMBER");
5858
}
5959

6060
@Before

0 commit comments

Comments
 (0)