Skip to content

Update Envoy to 751be72 (April 19th 2021)#674

Merged
mum4k merged 3 commits intoenvoyproxy:mainfrom
qqustc:envoy-update2
Apr 20, 2021
Merged

Update Envoy to 751be72 (April 19th 2021)#674
mum4k merged 3 commits intoenvoyproxy:mainfrom
qqustc:envoy-update2

Conversation

@qqustc
Copy link
Copy Markdown
Contributor

@qqustc qqustc commented Apr 19, 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 test: making assert required 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

qqustc added 3 commits April 19, 2021 14:07
Signed-off-by: qqustc@gmail.com <qqin@google.com>
Signed-off-by: qqustc@gmail.com <qqin@google.com>
Signed-off-by: qqustc@gmail.com <qqin@google.com>
@qqustc qqustc marked this pull request as ready for review April 19, 2021 21:43
@qqustc qqustc added the waiting-for-review A PR waiting for a review. label Apr 19, 2021
@mum4k mum4k merged commit b2e7dca into envoyproxy:main Apr 20, 2021
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>
@qqustc qqustc deleted the envoy-update2 branch May 17, 2021 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

waiting-for-review A PR waiting for a review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants