Skip to content

Commit 6c21001

Browse files
committed
Increase e2e test timeout to 30m
Signed-off-by: joshvanl <[email protected]>
1 parent 468626b commit 6c21001

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ TEST_OUTPUT_FILE ?= test_output.json
7474

7575
# Set the default timeout for tests to 10 minutes
7676
ifndef E2E_SH_TEST_TIMEOUT
77-
override E2E_SH_TEST_TIMEOUT := 10m
77+
override E2E_SH_TEST_TIMEOUT := 30m
7878
endif
7979

8080
# Use the variable H to add a header (equivalent to =>) to informational output

tests/e2e/standalone/scheduler_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333

3434
func TestSchedulerList(t *testing.T) {
3535
cmdUninstall()
36-
cleanUpLogs()
3736
ensureDaprInstallation(t)
3837
t.Cleanup(func() {
3938
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -42,7 +41,6 @@ func TestSchedulerList(t *testing.T) {
4241
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
4342
t.Cleanup(func() {
4443
cmdStopWithAppID("test-scheduler")
45-
cleanUpLogs()
4644
waitAppsToBeStopped()
4745
})
4846
args := []string{"-f", runFilePath}
@@ -179,7 +177,6 @@ func TestSchedulerList(t *testing.T) {
179177

180178
func TestSchedulerGet(t *testing.T) {
181179
cmdUninstall()
182-
cleanUpLogs()
183180
ensureDaprInstallation(t)
184181
t.Cleanup(func() {
185182
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -188,7 +185,6 @@ func TestSchedulerGet(t *testing.T) {
188185
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
189186
t.Cleanup(func() {
190187
cmdStopWithAppID("test-scheduler")
191-
cleanUpLogs()
192188
waitAppsToBeStopped()
193189
})
194190
args := []string{"-f", runFilePath}
@@ -276,7 +272,6 @@ func TestSchedulerGet(t *testing.T) {
276272

277273
func TestSchedulerDelete(t *testing.T) {
278274
cmdUninstall()
279-
cleanUpLogs()
280275
ensureDaprInstallation(t)
281276
t.Cleanup(func() {
282277
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -285,7 +280,6 @@ func TestSchedulerDelete(t *testing.T) {
285280
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
286281
t.Cleanup(func() {
287282
cmdStopWithAppID("test-scheduler")
288-
cleanUpLogs()
289283
waitAppsToBeStopped()
290284
})
291285
args := []string{"-f", runFilePath}
@@ -342,7 +336,6 @@ func TestSchedulerDelete(t *testing.T) {
342336

343337
func TestSchedulerDeleteAllAll(t *testing.T) {
344338
cmdUninstall()
345-
cleanUpLogs()
346339
ensureDaprInstallation(t)
347340
t.Cleanup(func() {
348341
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -351,7 +344,6 @@ func TestSchedulerDeleteAllAll(t *testing.T) {
351344
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
352345
t.Cleanup(func() {
353346
cmdStopWithAppID("test-scheduler")
354-
cleanUpLogs()
355347
waitAppsToBeStopped()
356348
})
357349
args := []string{"-f", runFilePath}
@@ -374,7 +366,6 @@ func TestSchedulerDeleteAllAll(t *testing.T) {
374366

375367
func TestSchedulerDeleteAll(t *testing.T) {
376368
cmdUninstall()
377-
cleanUpLogs()
378369
ensureDaprInstallation(t)
379370
t.Cleanup(func() {
380371
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -383,7 +374,6 @@ func TestSchedulerDeleteAll(t *testing.T) {
383374
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
384375
t.Cleanup(func() {
385376
cmdStopWithAppID("test-scheduler")
386-
cleanUpLogs()
387377
waitAppsToBeStopped()
388378
})
389379
args := []string{"-f", runFilePath}
@@ -429,7 +419,6 @@ func TestSchedulerDeleteAll(t *testing.T) {
429419

430420
func TestSchedulerExportImport(t *testing.T) {
431421
cmdUninstall()
432-
cleanUpLogs()
433422
ensureDaprInstallation(t)
434423
t.Cleanup(func() {
435424
must(t, cmdUninstall, "failed to uninstall Dapr")
@@ -438,7 +427,6 @@ func TestSchedulerExportImport(t *testing.T) {
438427
runFilePath := "../testdata/run-template-files/test-scheduler.yaml"
439428
t.Cleanup(func() {
440429
cmdStopWithAppID("test-scheduler")
441-
cleanUpLogs()
442430
waitAppsToBeStopped()
443431
})
444432
args := []string{"-f", runFilePath}

tests/e2e/testdata/run-template-files/test-scheduler.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ apps:
44
appDirPath: ../../../apps/scheduler/
55
appPort: 9084
66
daprHTTPPort: 3510
7-
command: ["go","run", "app.go"]
7+
command: ["go", "run", "app.go"]
88
appLogDestination: console
99
daprdLogDestination: console

0 commit comments

Comments
 (0)