Async argument 'timeout' fails if broker timeout is set to None

[aaronkurtz]

I'm using the 'orm' as a broker, but I suspect this will hit other brokers as well.

If the broker's timeout is set to None, as is the default, passing 'timeout' as an argument to async doesn't set the timeout properly. Once the broker has a timeout set, then the timeout can be overridden.

  Q_CLUSTER = { 
      'name': 'DjangoORM',
      'orm': 'default',
     'retry': 600,
  }

def block():
  import time
  while True:
    print("BLOCKING")
    time.sleep(1)

async(block, timeout=3)

The worker will never timeout. If timeout was set to something, then the worker times out in 3 seconds.

From what I can tell, setting timeout to -1 allows you to never timeout by default and to override it with the argument.