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.

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

fix(e2e): loosen up assertion on traffic route test (backport of #11764) #11775

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions test/e2e_env/universal/trafficroute/traffic_route.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package trafficroute

Check failure on line 1 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

: # github.com/kumahq/kuma/test/e2e_env/universal/trafficroute

import (
"fmt"
Expand Down Expand Up @@ -457,13 +457,19 @@
}, "30s", "500ms").Should(
And(
HaveLen(2),
<<<<<<< HEAD

Check failure on line 460 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected <<, expected expression
HaveKeyWithValue(MatchRegexp(`.*echo-v1.*`), BeNumerically("~", 2, 1)),
HaveKeyWithValue(MatchRegexp(`.*echo-v2.*`), BeNumerically("~", 8, 1)),
),

Check failure on line 463 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected ), expected expression
)
=======

Check failure on line 465 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected ==, expected }
HaveKey(`echo-v3`),
HaveKeyWithValue(`echo-v4`, BeNumerically("~", 80, 20)),
))

Check failure on line 468 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected ), expected expression
>>>>>>> 915de62b3 (fix(e2e): loosen up assertion on traffic route test (#11764))

Check failure on line 469 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected >>, expected }

Check failure on line 469 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

invalid character U+0023 '#'
})

Check failure on line 470 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected ) after top level declaration

It("should modify path", func() {

Check failure on line 472 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

method has no receiver

Check failure on line 472 in test/e2e_env/universal/trafficroute/traffic_route.go

View workflow job for this annotation

GitHub Actions / lint

syntax error: unexpected {, expected name
const trafficRoute = `
type: TrafficRoute
name: modify-path
Expand Down
Loading