Commit 9d489c68 authored by Jim Fulton's avatar Jim Fulton

Allow a timeout to be passed to tpc_abort for tests

Some test timeouts are very low to make the tests go less slow, but
sometimes we need to wait longer.
parent b0f317b7
...@@ -778,8 +778,11 @@ class ClientStorage(object): ...@@ -778,8 +778,11 @@ class ClientStorage(object):
def lastTransaction(self): def lastTransaction(self):
return self._cache.getLastTid() return self._cache.getLastTid()
def tpc_abort(self, txn): def tpc_abort(self, txn, timeout=None):
"""Storage API: abort a transaction. """Storage API: abort a transaction.
(The timeout keyword argument is for tests to wat longer than
they normally would.)
""" """
try: try:
tbuf = txn.data(self) tbuf = txn.data(self)
...@@ -798,7 +801,7 @@ class ClientStorage(object): ...@@ -798,7 +801,7 @@ class ClientStorage(object):
# wait a little while in hopes of reconnecting. If # wait a little while in hopes of reconnecting. If
# we're able to reconnect and retry the transaction, # we're able to reconnect and retry the transaction,
# ten it might succeed! # ten it might succeed!
self._call('tpc_abort', id(txn)) self._call('tpc_abort', id(txn), timeout=timeout)
except ClientDisconnected: except ClientDisconnected:
logger.debug("%s ClientDisconnected in tpc_abort() ignored", logger.debug("%s ClientDisconnected in tpc_abort() ignored",
self.__name__) self.__name__)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment