Skip to content

test: making assert required#15972

Merged
mattklein123 merged 4 commits intoenvoyproxy:mainfrom
alyssawilk:required
Apr 15, 2021
Merged

test: making assert required#15972
mattklein123 merged 4 commits intoenvoyproxy:mainfrom
alyssawilk:required

Conversation

@alyssawilk
Copy link
Copy Markdown
Contributor

follow-up on #15812 and envoyproxy/envoy-filter-example#143

Risk Level: n/a (test only)
Testing: n/a
Docs Changes: n/a
Release Notes: n/a

htuch
htuch previously approved these changes Apr 14, 2021
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.

LGTM, thanks!

@htuch htuch self-assigned this Apr 14, 2021
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk
Copy link
Copy Markdown
Contributor Author

apologies for force push - screwed up local state somehow

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #15972 was synchronize by alyssawilk.

see: more, trace.

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Apr 14, 2021
@qinggniq
Copy link
Copy Markdown
Contributor

@alyssawilk Hello, have you solved the ci flakes of http_filter_integration_test at ci asan or tsan? My pr #15803 is rely on it. I change ci/filter_example_setup.sh, set SHA to my commit at my fork repo, but it failed at http_filter_integration_test. After test, I found this commit lead to the failure of test.

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
@alyssawilk
Copy link
Copy Markdown
Contributor Author

@qinggniq sorry about that - ironically the new ASSERT was designed to catch timeouts like this, I just didn't realize that test was already broken!
envoyproxy/envoy-filter-example#146 should hopefully fix but if not I'll get it sorted out somehow today, either by reverting the two changes or actually getting that test working as it was intended to!

@alyssawilk
Copy link
Copy Markdown
Contributor Author

To confirm, CI is happy with this hash, sorry about the temporary breakage!

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Nice!

@mattklein123 mattklein123 merged commit e2eebec into envoyproxy:main Apr 15, 2021
douglas-reid pushed a commit to douglas-reid/envoy that referenced this pull request Apr 19, 2021
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Douglas Reid <douglas-reid@users.noreply.github.com>
Monkeyanator pushed a commit to Monkeyanator/envoy that referenced this pull request Apr 20, 2021
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
mum4k pushed a commit to envoyproxy/nighthawk that referenced this pull request Apr 20, 2021
- Sync .bazelrc
- Update Docker image version in .circleci/config.yml
- ci/run_envoy_docker.sh was unchanged
- Code changes
  - Remove `response->waitForEndStream();` from `HttpFilterIntegrationTestBase::getResponse()` in test/server/http_filter_integration_test_base.cc due to envoyproxy/envoy#15972. We can't simply change it to `ASSERT_TRUE(response->waitForEndStream());` in `HttpFilterIntegrationTestBase::getResponse()` since this will cause error:
    ```
    test/server/http_filter_integration_test_base.cc:69:5: error: no viable conversion from returned value of type 'void' to function return type 'Envoy::IntegrationStreamDecoderPtr' (aka 'unique_ptr<Envoy::IntegrationStreamDecoder>')
        ASSERT_TRUE(response->waitForEndStream());
    ```
   - Added `ASSERT_TRUE(response->waitForEndStream());` to all places where `HttpFilterIntegrationTestBase::getResponse()` is called in the tests.

Signed-off-by: qqustc@gmail.com <qqin@google.com>
gokulnair pushed a commit to gokulnair/envoy that referenced this pull request May 6, 2021
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Gokul Nair <gnair@twitter.com>
wjuan-AFK pushed a commit to wjuan-AFK/nighthawk that referenced this pull request May 11, 2021
- Sync .bazelrc
- Update Docker image version in .circleci/config.yml
- ci/run_envoy_docker.sh was unchanged
- Code changes
  - Remove `response->waitForEndStream();` from `HttpFilterIntegrationTestBase::getResponse()` in test/server/http_filter_integration_test_base.cc due to envoyproxy/envoy#15972. We can't simply change it to `ASSERT_TRUE(response->waitForEndStream());` in `HttpFilterIntegrationTestBase::getResponse()` since this will cause error:
    ```
    test/server/http_filter_integration_test_base.cc:69:5: error: no viable conversion from returned value of type 'void' to function return type 'Envoy::IntegrationStreamDecoderPtr' (aka 'unique_ptr<Envoy::IntegrationStreamDecoder>')
        ASSERT_TRUE(response->waitForEndStream());
    ```
   - Added `ASSERT_TRUE(response->waitForEndStream());` to all places where `HttpFilterIntegrationTestBase::getResponse()` is called in the tests.

Signed-off-by: qqustc@gmail.com <qqin@google.com>
Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com>
@alyssawilk alyssawilk deleted the required branch February 28, 2022 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deps Approval required for changes to Envoy's external dependencies

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants