test: another echo_integration_test fix

test/integration/echo_integration_test.cc

@@ -130,7 +130,12 @@ TEST_P(EchoIntegrationTest, AddRemoveListener) {
     RawConnectionDriver connection2(
         new_listener_port, buffer,
         [&](Network::ClientConnection&, const Buffer::Instance&) -> void { FAIL(); }, version_);
-    connection2.run(Event::Dispatcher::RunType::NonBlock);
+    while (connection2.connecting()) {
+      // Don't busy loop, but OS X often needs a moment to decide this connection isn't happening.
+      std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+      connection2.run(Event::Dispatcher::RunType::NonBlock);
+    }
     if (connection2.connection().state() == Network::Connection::State::Closed) {
       connect_fail = true;
       break;

test/integration/utility.cc

@@ -111,10 +111,12 @@ RawConnectionDriver::RawConnectionDriver(uint32_t port, Buffer::Instance& initia
                                          Network::Address::IpVersion version) {
   api_.reset(new Api::Impl(std::chrono::milliseconds(10000)));
   dispatcher_ = api_->allocateDispatcher(IntegrationUtil::evil_singleton_test_time_.timeSource());
+  callbacks_.reset(new ConnectionCallbacks());
   client_ = dispatcher_->createClientConnection(
       Network::Utility::resolveUrl(
           fmt::format("tcp://{}:{}", Network::Test::getLoopbackAddressUrlString(version), port)),
       Network::Address::InstanceConstSharedPtr(), Network::Test::createRawBufferSocket(), nullptr);
+  client_->addConnectionCallbacks(*callbacks_);
   client_->addReadFilter(Network::ReadFilterSharedPtr{new ForwardingFilter(*this, data_callback)});
   client_->write(initial_data, false);
   client_->connect();

test/integration/utility.h

@@ -62,6 +62,7 @@ class RawConnectionDriver {
                       Network::Address::IpVersion version);
   ~RawConnectionDriver();
   const Network::Connection& connection() { return *client_; }
+  bool connecting() { return callbacks_->connecting_; }
   void run(Event::Dispatcher::RunType run_type = Event::Dispatcher::RunType::Block);
   void close();
 
@@ -81,8 +82,17 @@ class RawConnectionDriver {
     ReadCallback data_callback_;
   };
 
+  struct ConnectionCallbacks : public Network::ConnectionCallbacks {
+    void onEvent(Network::ConnectionEvent) override { connecting_ = false; }
+    void onAboveWriteBufferHighWatermark() override {}
+    void onBelowWriteBufferLowWatermark() override {}
+
+    bool connecting_{true};
+  };
+
   Api::ApiPtr api_;
   Event::DispatcherPtr dispatcher_;
+  std::shared_ptr<ConnectionCallbacks> callbacks_;
   Network::ClientConnectionPtr client_;
 };