build/test: fix various build/test failures. (envoyproxy#62)

* Fix WORKSPACE issue in envoyproxy#61. * Also seems to have regressed due to TimeSystem and other integration test API changes Fixes envoyproxy#61 Signed-off-by: Harvey Tuch <[email protected]>
jmarantz · Oct 1, 2018 · b16e5ff · b16e5ff
1 parent 4ea9a67
commit b16e5ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,9 +16,7 @@ load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
 api_dependencies()
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-load("@com_lyft_protoc_gen_validate//bazel:go_proto_library.bzl", "go_proto_repositories")
-go_proto_repositories(shared=0)
 go_rules_dependencies()
 go_register_toolchains()
 load("@io_bazel_rules_go//proto:def.bzl", "proto_register_toolchains")
-proto_register_toolchains()
+proto_register_toolchains()
diff --git a/http-filter-example/http_filter_integration_test.cc b/http-filter-example/http_filter_integration_test.cc
@@ -5,7 +5,7 @@ class HttpFilterSampleIntegrationTest : public HttpIntegrationTest,
                                         public testing::TestWithParam<Network::Address::IpVersion> {
 public:
   HttpFilterSampleIntegrationTest()
-      : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam()) {}
+      : HttpIntegrationTest(Http::CodecClient::Type::HTTP1, GetParam(), realTime()) {}
   /**
    * Initializer for an individual integration test.
    */
@@ -29,9 +29,10 @@ TEST_P(HttpFilterSampleIntegrationTest, Test1) {
 
   codec_client = makeHttpConnection(lookupPort("http"));
   auto response = codec_client->makeHeaderOnlyRequest(headers);
-  fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection, std::chrono::milliseconds(5));
-  fake_upstream_connection->waitForNewStream(*dispatcher_, request_stream);
-  request_stream->waitForEndStream(*dispatcher_);
+  ASSERT_TRUE(fake_upstreams_[0]->waitForHttpConnection(*dispatcher_, fake_upstream_connection,
+                                                        std::chrono::milliseconds(5)));
+  ASSERT_TRUE(fake_upstream_connection->waitForNewStream(*dispatcher_, request_stream));
+  ASSERT_TRUE(request_stream->waitForEndStream(*dispatcher_));
   response->waitForEndStream();
 
   EXPECT_STREQ("sample-filter",