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

Match regexes for error strings in e2e #19851

Merged
merged 1 commit into from Jan 21, 2016
Merged

Match regexes for error strings in e2e #19851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions test/e2e/service.go
View file
Open in desktop
Expand Up @@ -645,9 +645,8 @@ var _ = Describe("Services", func() {
if err == nil {
Failf("Created service with conflicting NodePort: %v", result2)
}
expectedErr := fmt.Sprintf("Service \"%s\" is invalid: spec.ports[0].nodePort: Invalid value: %d: provided port is already allocated",
serviceName2, port.NodePort)
Expect(fmt.Sprintf("%v", err)).To(Equal(expectedErr))
expectedErr := fmt.Sprintf("%d.*port is already allocated", port.NodePort)
Expect(fmt.Sprintf("%v", err)).To(MatchRegexp(expectedErr))

By("deleting service " + serviceName1 + " to release NodePort")
err = t.DeleteService(serviceName1)
Expand Down Expand Up @@ -706,8 +705,8 @@ var _ = Describe("Services", func() {
if err == nil {
Failf("failed to prevent update of service with out-of-range NodePort: %v", result)
}
expectedErr := fmt.Sprintf("Service \"%s\" is invalid: spec.ports[0].nodePort: Invalid value: %d: provided port is not in the valid range", serviceName, outOfRangeNodePort)
Expect(fmt.Sprintf("%v", err)).To(Equal(expectedErr))
expectedErr := fmt.Sprintf("%d.*port is not in the valid range", outOfRangeNodePort)
Expect(fmt.Sprintf("%v", err)).To(MatchRegexp(expectedErr))

By("deleting original service " + serviceName)
err = t.DeleteService(serviceName)
Expand All @@ -721,7 +720,7 @@ var _ = Describe("Services", func() {
if err == nil {
Failf("failed to prevent create of service with out-of-range NodePort (%d): %v", outOfRangeNodePort, service)
}
Expect(fmt.Sprintf("%v", err)).To(Equal(expectedErr))
Expect(fmt.Sprintf("%v", err)).To(MatchRegexp(expectedErr))
})

It("should release NodePorts on delete", func() {
Expand Down