Skip to content

Commit

Permalink
Merge pull request #558 from wjps/fix-test-timeouts
Browse files Browse the repository at this point in the history 
Fix incorrect x-expires argument in acceptance tests
  • Loading branch information
@gmr
gmr committed May 4, 2015
2 parents dc9db2b + e3ebb6f commit 9b33033
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
3 changes: 2 additions & 1 deletion tests/acceptance/async_test_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ def on_exchange_declared(self, frame):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000}
)

def on_queue_declared(self, frame):
self.channel.queue_bind(self.on_ready, self.queue, self.exchange,
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/asyncore_adapter_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=False,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -138,7 +138,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -164,7 +164,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_channel_closed(self, channel, reply_code, reply_text):
self.stop()
Expand All @@ -176,7 +176,7 @@ def on_queue_declared(self, frame):
exclusive=False,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_bad_result(self, frame):
self.channel.queue_delete(None, str(id(self)), nowait=True)
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/libev_adapter_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=False,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -141,7 +141,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand Down Expand Up @@ -169,7 +169,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_channel_closed(self, channel, reply_code, reply_text):
self.stop()
Expand All @@ -181,7 +181,7 @@ def on_queue_declared(self, frame):
exclusive=False,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_bad_result(self, frame):
self.channel.queue_delete(None, str(id(self)), nowait=True)
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/select_adapter_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=False,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -168,7 +168,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -194,7 +194,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_channel_closed(self, channel, reply_code, reply_text):
self.stop()
Expand All @@ -206,7 +206,7 @@ def on_queue_declared(self, frame):
exclusive=False,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_bad_result(self, frame):
self.channel.queue_delete(None, str(id(self)), nowait=True)
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/tornado_adapter_tests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=False,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -126,7 +126,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_queue_declared(self, frame):
self.assertIsInstance(frame.method, spec.Queue.DeclareOk)
Expand All @@ -152,7 +152,7 @@ def begin(self, channel):
exclusive=True,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_channel_closed(self, channel, reply_code, reply_text):
self.stop()
Expand All @@ -164,7 +164,7 @@ def on_queue_declared(self, frame):
exclusive=False,
auto_delete=True,
nowait=False,
arguments={'x-expires': self.TIMEOUT})
arguments={'x-expires': self.TIMEOUT * 1000})

def on_bad_result(self, frame):
self.channel.queue_delete(None, str(id(self)), nowait=True)
Expand Down

0 comments on commit 9b33033

Please sign in to comment.