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

test: fix the timeout for tests #267

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+127 −124
Open

test: fix the timeout for tests #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2a44e7
test: fix the timeout for tests
zhiying-lin Feb 20, 2025
d3c8cbf
change default timeout
zhiying-lin Feb 25, 2025
07c62a5
address comments
zhiying-lin Feb 26, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
AZURE_RESOURCE_GROUP: ${{ env.AZURE_RESOURCE_GROUP }}
ENABLE_TRAFFIC_MANAGER: ${{ matrix.enable-traffic-manager }}
- name: Wait for role assignments to be effective
run: sleep 3m
run: sleep 5m
- name: Run e2e tests
run: |
make e2e-tests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ e2e-setup:

.PHONY: e2e-tests
e2e-tests:
go test -timeout 45m -tags=e2e -v ./test/e2e -args -ginkgo.v
go test -timeout 50m -tags=e2e -v ./test/e2e -args -ginkgo.v

.PHONY: e2e-cleanup
e2e-cleanup:
Expand Down
87 changes: 45 additions & 42 deletions pkg/controllers/hub/trafficmanagerbackend/controller_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
)

const (
timeout = time.Second * 10
interval = time.Millisecond * 250
timeout = time.Second * 10
Copy link
Contributor

Choose a reason for hiding this comment

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

can we define a common base line 10 second timeout for all tests instead of each have its own?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

do you mean creating a common variable somewhere and use that for all the controllers?

it's doable, but the timeout may not be necessarily the same and depends on the tests & implementations.

Copy link
Contributor

Choose a reason for hiding this comment

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

it seems that the below is good for all tests in this repo

defaultTimeout = time.Second * 10
lightAzureOperationTimeout = 1 * time.Minute
heavyAzureOperationTimeout = 10 * time.Minute

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are you suggesting to create a common timeout for all e2e tests?

These timeout may not be applied to integration tests, cause in the integration test, we use the fake arm call.

longTimeout = time.Second * 60
interval = time.Millisecond * 250
)

var (
Expand Down Expand Up @@ -132,7 +133,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -141,7 +142,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, namespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, namespacedName, timeout)
})
})

Expand Down Expand Up @@ -175,7 +176,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating TrafficManagerProfile status to programmed true and it should trigger controller", func() {
Expand All @@ -194,7 +195,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -203,7 +204,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -212,7 +213,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -251,7 +252,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -260,7 +261,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -269,7 +270,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -308,7 +309,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -317,7 +318,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -326,7 +327,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -372,7 +373,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating TrafficManagerProfile status to accepted unknown and it should trigger controller", func() {
Expand All @@ -398,7 +399,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -407,7 +408,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -416,7 +417,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -455,7 +456,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -464,7 +465,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -473,7 +474,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -510,7 +511,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Spec: backend.Spec,
// not able to set the condition
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -519,7 +520,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -528,7 +529,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -569,7 +570,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Creating a new ServiceImport", func() {
Expand All @@ -593,7 +594,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating the ServiceImport status", func() {
Expand Down Expand Up @@ -627,7 +628,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -636,7 +637,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})

It("Deleting serviceImport", func() {
Expand Down Expand Up @@ -681,7 +682,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -706,7 +707,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -749,7 +750,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -778,7 +779,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -808,7 +809,9 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
// The controller should reconcile the trafficManagerBackend using backoff algorithm.
// It may take longer and depends on the failure times.
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, longTimeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -862,7 +865,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -909,7 +912,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -952,7 +955,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -982,7 +985,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -1016,7 +1019,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -1052,7 +1055,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -1074,7 +1077,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildTrueCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -1084,7 +1087,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -1093,7 +1096,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})

It("Deleting serviceImport", func() {
Expand Down
Loading
Loading