github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Match regexes for error strings in e2e

Browse Source
This commit is contained in:
Tim Hockin 2016-01-19 21:13:39 -08:00
parent 3d7c79ca03
commit a1df9ff4b4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/service.go
View File

@ -645,9 +645,8 @@ var _ = Describe("Services", func() {
if err == nil { if err == nil {
Failf("Created service with conflicting NodePort: %v", result2) 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", expectedErr := fmt.Sprintf("%d.*port is already allocated", port.NodePort)
serviceName2, port.NodePort) Expect(fmt.Sprintf("%v", err)).To(MatchRegexp(expectedErr))
Expect(fmt.Sprintf("%v", err)).To(Equal(expectedErr))
By("deleting service " + serviceName1 + " to release NodePort") By("deleting service " + serviceName1 + " to release NodePort")
err = t.DeleteService(serviceName1) err = t.DeleteService(serviceName1)
@ -706,8 +705,8 @@ var _ = Describe("Services", func() {
if err == nil { if err == nil {
Failf("failed to prevent update of service with out-of-range NodePort: %v", result) 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) expectedErr := fmt.Sprintf("%d.*port is not in the valid range", outOfRangeNodePort)
Expect(fmt.Sprintf("%v", err)).To(Equal(expectedErr)) Expect(fmt.Sprintf("%v", err)).To(MatchRegexp(expectedErr))
By("deleting original service " + serviceName) By("deleting original service " + serviceName)
err = t.DeleteService(serviceName) err = t.DeleteService(serviceName)
@ -721,7 +720,7 @@ var _ = Describe("Services", func() {
if err == nil { if err == nil {
Failf("failed to prevent create of service with out-of-range NodePort (%d): %v", outOfRangeNodePort, service) 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() { It("should release NodePorts on delete", func() {