seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
tecnovert 2019-11-18 23:30:31 +02:00
parent b1f5be083c
commit 617006c67a
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basicswap/basicswap.py
View File

@ -1832,6 +1832,9 @@ class BasicSwap(BaseApp):
elif state == BidStates.SWAP_PARTICIPATING: elif state == BidStates.SWAP_PARTICIPATING:
# Waiting for initiate txn spend # Waiting for initiate txn spend
pass pass
elif state == BidStates.BID_ERROR:
# Wait for user input
pass
else: else:
self.log.warning('checkBidState unknown state %s', state) self.log.warning('checkBidState unknown state %s', state)
@ -2050,7 +2053,7 @@ class BasicSwap(BaseApp):
else: else:
self.log.warning('Unknown event type: %d', row.event_type) self.log.warning('Unknown event type: %d', row.event_type)
session.query.filter(EventQueue.event_id == row.event_id).delete() session.delete(row)
session.commit() session.commit()
session.close() session.close()

6
tests/basicswap/test_run.py
View File

@ -561,6 +561,10 @@ class Test(unittest.TestCase):
self.wait_for_bid_state(swap_clients[0], bid_id, BidStates.BID_ERROR, seconds_for=60) self.wait_for_bid_state(swap_clients[0], bid_id, BidStates.BID_ERROR, seconds_for=60)
swap_clients[0].abandonBid(bid_id)
del swap_clients[0].coin_clients[Coins.BTC]['override_feerate']
del swap_clients[0].coin_clients[Coins.LTC]['override_feerate']
def test_08_part_ltc_buyer_first(self): def test_08_part_ltc_buyer_first(self):
logging.info('---------- Test PART to LTC, buyer first') logging.info('---------- Test PART to LTC, buyer first')
swap_clients = self.swap_clients swap_clients = self.swap_clients
@ -591,7 +595,7 @@ class Test(unittest.TestCase):
assert(js_1['num_swapping'] == 0 and js_1['num_watched_outputs'] == 0) assert(js_1['num_swapping'] == 0 and js_1['num_watched_outputs'] == 0)
def test_09_part_ltc_auto_accept(self): def test_09_part_ltc_auto_accept(self):
logging.info('---------- Test PART to LTC, auto aceept bid') logging.info('---------- Test PART to LTC, auto accept bid')
swap_clients = self.swap_clients swap_clients = self.swap_clients
offer_id = swap_clients[0].postOffer(Coins.PART, Coins.LTC, 100 * COIN, 0.1 * COIN, 100 * COIN, SwapTypes.SELLER_FIRST, auto_accept_bids=True) offer_id = swap_clients[0].postOffer(Coins.PART, Coins.LTC, 100 * COIN, 0.1 * COIN, 100 * COIN, SwapTypes.SELLER_FIRST, auto_accept_bids=True)