+++ This bug was initially created as a clone of Bug #1044002 +++

Description of problem:

The python client only uses heartbeats once the connection has been established. It does not use them to time out the initial connect attempt.

E.g. modify drain to use a 5sec heartbeat, start a broker, run drain -f amq.direct and then kill -STOP the broker - heartbeats are missed and connection times out as expected.

But now try to reconnect to the hung broker, and the connect attempt will not timeout.

Version-Release number of selected component (if applicable):

2.3 and before as well as 3.0 early access

How reproducible:

100%

Steps to Reproduce:
1. modify drain to use a 5sec heartbeat
2. start a broker
3. drain -f amq.direct
4. kill -STOP the broker
5. restart drain -f amq.direct

Actual results:

heartbeat times out the drain in step 3 but not in step 5, where it hangs

Expected results:

In both step 3 and 5 drain exits with timeout after 10 seconds

Additional info: