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

internal/featuretests: fix test merge conflicts #6057

Merged
merged 1 commit into from
Jan 5, 2024

Conversation

skriss
Copy link
Member

@skriss skriss commented Jan 5, 2024

Fixes test merge conflicts with #6016 and #6013.

Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
@skriss skriss added the release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes. label Jan 5, 2024
@skriss skriss requested a review from a team as a code owner January 5, 2024 19:06
@skriss skriss requested review from tsaarni and sunjayBhatia and removed request for a team January 5, 2024 19:06
@sunjayBhatia sunjayBhatia requested review from a team, davinci26 and clayton-gonsalves and removed request for a team January 5, 2024 19:06
Copy link
Contributor

@davinci26 davinci26 left a comment

Choose a reason for hiding this comment

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

:ty

@sunjayBhatia
Copy link
Member

looks like the tests passed but we got bit by the grpc-go race: #6055

Copy link

codecov bot commented Jan 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0b8ab80) 78.77% compared to head (d7a23de) 78.77%.
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #6057   +/-   ##
=======================================
  Coverage   78.77%   78.77%           
=======================================
  Files         138      138           
  Lines       19747    19753    +6     
=======================================
+ Hits        15555    15561    +6     
  Misses       3888     3888           
  Partials      304      304           
Files Coverage Δ
internal/annotation/annotations.go 100.00% <100.00%> (ø)
internal/dag/accessors.go 87.39% <100.00%> (+0.05%) ⬆️
internal/dag/dag.go 98.70% <ø> (ø)
internal/envoy/v3/cluster.go 96.40% <100.00%> (+0.03%) ⬆️

@sunjayBhatia sunjayBhatia merged commit 387e6a7 into projectcontour:main Jan 5, 2024
30 checks passed
@skriss skriss deleted the pr-fix-tests branch January 5, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants