Fixes MAISTRA-1167: RetryHostPredicateFilter in protocol_integration_…

…test suite passes now (maistra#3)
dmitri-d · Mar 9, 2020 · 61b3080 · 61b3080
1 parent 9e24d37
commit 61b3080
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/test/integration/protocol_integration_test.cc b/test/integration/protocol_integration_test.cc
@@ -387,13 +387,11 @@ TEST_P(DownstreamProtocolIntegrationTest, RetryPriority) {
   EXPECT_EQ(512U, response->body().size());
 }
 
-// TODO (dmitri-d) fix "An queued upstream connection was torn down without being associated with a fake connection"
-//
 // Verifies that a retry host filter can be configured and affect the host selected during retries.
 // The predicate will keep track of the first host attempted, and attempt to route all requests to
 // the same host. With a total of two upstream hosts, this should result in us continuously sending
 // requests to the same host.
-TEST_P(DownstreamProtocolIntegrationTest, DISABLED_RetryHostPredicateFilter) {
+TEST_P(DownstreamProtocolIntegrationTest, RetryHostPredicateFilter) {
   TestHostPredicateFactory predicate_factory;
   Registry::InjectFactory<Upstream::RetryHostPredicateFactory> inject_factory(predicate_factory);
 

diff --git a/test/test_common/utility.h b/test/test_common/utility.h
@@ -444,7 +444,7 @@ class TestUtility {
   static std::string convertTime(const std::string& input, const std::string& input_format,
                                  const std::string& output_format);
 
-  static constexpr std::chrono::milliseconds DefaultTimeout = std::chrono::milliseconds(30000);
+  static constexpr std::chrono::milliseconds DefaultTimeout = std::chrono::milliseconds(10000);
 
   static void renameFile(const std::string& old_name, const std::string& new_name);
   static void createDirectory(const std::string& name);