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

Jump to bottom

Remove fail-fast for Ginkgo #152

Merged
merged 3 commits into from
Jul 10, 2023
Merged

Remove fail-fast for Ginkgo #152

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
dcce05a
Remove `fail-fast` for Ginkgo
dhaiducek Jul 7, 2023
7637210
Deduplicate E2E policy names
dhaiducek Jul 7, 2023
5be19d1
E2E tweaks
dhaiducek Jul 7, 2023
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ install-resources:

.PHONY: e2e-test
e2e-test: e2e-dependencies
$(GINKGO) -v -p -procs=20 --fail-fast $(E2E_TEST_ARGS) test/e2e
$(GINKGO) -v --procs=20 $(E2E_TEST_ARGS) test/e2e

.PHONY: e2e-test-coverage
e2e-test-coverage: E2E_TEST_ARGS = --json-report=report_e2e.json --label-filter='!hosted-mode && !running-in-cluster' --output-dir=.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/case13_templatization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const (
const (
case13Unterminated string = "policy-pod-create-unterminated"
case13UnterminatedYaml string = "../resources/case13_templatization/case13_unterminated.yaml"
case13WrongArgs string = "policy-pod-create-wrong-args"
case13WrongArgs string = "case13-policy-pod-create-wrong-args"
case13WrongArgsYaml string = "../resources/case13_templatization/case13_wrong_args.yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/case30_multiline_templatization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
const (
case30Unterminated string = "case30-configpolicy"
case30UnterminatedYaml string = "../resources/case30_multiline_templatization/case30_unterminated.yaml"
case30WrongArgs string = "policy-pod-create-wrong-args"
case30WrongArgs string = "case30-policy-pod-create-wrong-args"
case30WrongArgsYaml string = "../resources/case30_multiline_templatization/case30_wrong_args.yaml"
case30NoObject string = "case30-configpolicy-no-object"
case30NoObjectPolicyYaml string = "../resources/case30_multiline_templatization/case30_no_object.yaml"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/case5_multi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var _ = Describe("Test multiple obj template handling", func() {
})
})

Describe("Check messages when it is multiple namesapces and multiple obj-templates", Ordered, func() {
Describe("Check messages when it is multiple namespaces and multiple obj-templates", Ordered, func() {
const (
case5MultiNamespace1 string = "n1"
case5MultiNamespace2 string = "n2"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func deleteConfigPolicies(policyNames []string) {
context.TODO(), policyName, metav1.DeleteOptions{},
)
if !errors.IsNotFound(err) {
Expect(err).ToNot(HaveOccurred())
ExpectWithOffset(1, err).ToNot(HaveOccurred())
}
}

Expand All @@ -212,7 +212,7 @@ func deletePods(podNames []string, namespaces []string) {
context.TODO(), podName, metav1.DeleteOptions{},
)
if !errors.IsNotFound(err) {
Expect(err).ToNot(HaveOccurred())
ExpectWithOffset(1, err).ToNot(HaveOccurred())
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/resources/case13_templatization/case13_wrong_args.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: policy.open-cluster-management.io/v1
kind: ConfigurationPolicy
metadata:
name: policy-pod-create-wrong-args
name: case13-policy-pod-create-wrong-args
spec:
remediationAction: enforce
namespaceSelector:
Expand Down
2 changes: 1 addition & 1 deletion test/resources/case30_multiline_templatization/case30_wrong_args.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: policy.open-cluster-management.io/v1
kind: ConfigurationPolicy
metadata:
name: policy-pod-create-wrong-args
name: case30-policy-pod-create-wrong-args
spec:
remediationAction: enforce
namespaceSelector:
Expand Down
3 changes: 2 additions & 1 deletion test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ func GetWithTimeout(
return err
}
if !wantFound && err == nil {
return fmt.Errorf("expected to return IsNotFound error")
return fmt.Errorf("expected '%s/%s' in namespace '%s' to return IsNotFound error",
gvr.Resource, name, namespace)
}
if !wantFound && err != nil && !errors.IsNotFound(err) {
return err
Expand Down