Skip to content

test: merge delta CDS integration test into normal CDS#6214

Merged
htuch merged 6 commits intoenvoyproxy:masterfrom
fredlas:RF2_refactor_delta_and_cds
Mar 21, 2019
Merged

test: merge delta CDS integration test into normal CDS#6214
htuch merged 6 commits intoenvoyproxy:masterfrom
fredlas:RF2_refactor_delta_and_cds

Conversation

@fredlas
Copy link
Copy Markdown
Contributor

@fredlas fredlas commented Mar 7, 2019

Description: Refactor requested in #5466 by @htuch. Move all of delta_cds_integration_test.cc into cds_integration_test.cc, with some cute code sharing. Move the config fragment strings into test/config/utility.cc.
Risk Level: none

Signed-off-by: Fred Douglas <fredlas@google.com>
@mattklein123 mattklein123 assigned ahedberg and htuch and unassigned ahedberg Mar 10, 2019
Copy link
Copy Markdown
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Nice cleanup. A few questions and needs master merge.

/wait

Signed-off-by: Fred Douglas <fredlas@google.com>
fredlas added 2 commits March 11, 2019 17:44
Signed-off-by: Fred Douglas <fredlas@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Copy link
Copy Markdown
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Sorry for the delayed response, I was doing my Inbox -> Gmail migration over the past few days and some GH updates were lost.

/wait:any

@fredlas
Copy link
Copy Markdown
Contributor Author

fredlas commented Mar 15, 2019

Tests should be straightforward and clear, even if it means some repetition. If the repetition gets unbearable, then you're forced to get fancier (and harder for newcomers to understand), but until then simple is best. I do not have current plans to add tests that would use different configs, so I would prefer to see the current changes stay simple. Similarly, there are only two roughly similar tests between normal and delta. I don't think that adding if(param) blocks is worth it for what currently exists.

@htuch
Copy link
Copy Markdown
Member

htuch commented Mar 18, 2019

@fredlas this is fine with me,but I would like to get @alyssawilk to also sign-off, since she is the expert on config helper and its architecture.

@htuch
Copy link
Copy Markdown
Member

htuch commented Mar 19, 2019

@fredlas OK, I think we can agree that it's fine to have some replication for delta and non-delta. However, let's continue to discuss the hardcoded bootstrap YAML, as I agree with @alyssawilk that this is a good opportunity to reduce technical debt.

fredlas added 2 commits March 20, 2019 11:53
Signed-off-by: Fred Douglas <fredlas@google.com>
…a_and_cds

Signed-off-by: Fred Douglas <fredlas@google.com>
Copy link
Copy Markdown
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Thanks!

@htuch htuch merged commit d753d6b into envoyproxy:master Mar 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants