Skip to content

N
neo
Commit c0b9f5b4 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

Update tests against previous changes to client cache 

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2713 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 2c17284f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 264 deletions
neo/tests/__init__.py
View file @ c0b9f5b4
...@@ -304,8 +304,9 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -304,8 +304,9 @@ class NeoUnitTestBase(NeoTestBase):
""" ensure no UUID was set on the connection """ """ ensure no UUID was set on the connection """
calls = conn.mockGetNamedCalls('setUUID') calls = conn.mockGetNamedCalls('setUUID')
self.assertEqual(len(calls), 1) self.assertEqual(len(calls), 1)
call = calls.pop()
if uuid is not None: if uuid is not None:
self.assertEqual(calls[0].getParam(0), uuid) self.assertEqual(call.getParam(0), uuid)
# in check(Ask|Answer|Notify)Packet we return the packet so it can be used # in check(Ask|Answer|Notify)Packet we return the packet so it can be used
# in tests if more accurates checks are required # in tests if more accurates checks are required
...@@ -314,7 +315,7 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -314,7 +315,7 @@ class NeoUnitTestBase(NeoTestBase):
""" Check if an error packet was answered """ """ Check if an error packet was answered """
calls = conn.mockGetNamedCalls("answer") calls = conn.mockGetNamedCalls("answer")
self.assertEqual(len(calls), 1) self.assertEqual(len(calls), 1)
packet = calls[0].getParam(0) packet = calls.pop().getParam(0)
self.assertTrue(isinstance(packet, protocol.Packet)) self.assertTrue(isinstance(packet, protocol.Packet))
self.assertEqual(packet.getType(), Packets.Error) self.assertEqual(packet.getType(), Packets.Error)
if decode: if decode:
...@@ -326,7 +327,7 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -326,7 +327,7 @@ class NeoUnitTestBase(NeoTestBase):
""" Check if an ask-packet with the right type is sent """ """ Check if an ask-packet with the right type is sent """
calls = conn.mockGetNamedCalls('ask') calls = conn.mockGetNamedCalls('ask')
self.assertEqual(len(calls), 1) self.assertEqual(len(calls), 1)
packet = calls[0].getParam(0) packet = calls.pop().getParam(0)
self.assertTrue(isinstance(packet, protocol.Packet)) self.assertTrue(isinstance(packet, protocol.Packet))
self.assertEqual(packet.getType(), packet_type) self.assertEqual(packet.getType(), packet_type)
if decode: if decode:
...@@ -337,7 +338,7 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -337,7 +338,7 @@ class NeoUnitTestBase(NeoTestBase):
""" Check if an answer-packet with the right type is sent """ """ Check if an answer-packet with the right type is sent """
calls = conn.mockGetNamedCalls('answer') calls = conn.mockGetNamedCalls('answer')
self.assertEqual(len(calls), 1) self.assertEqual(len(calls), 1)
packet = calls[0].getParam(0) packet = calls.pop().getParam(0)
self.assertTrue(isinstance(packet, protocol.Packet)) self.assertTrue(isinstance(packet, protocol.Packet))
self.assertEqual(packet.getType(), packet_type) self.assertEqual(packet.getType(), packet_type)
if decode: if decode:
...@@ -347,8 +348,7 @@ class NeoUnitTestBase(NeoTestBase): ...@@ -347,8 +348,7 @@ class NeoUnitTestBase(NeoTestBase):
def checkNotifyPacket(self, conn, packet_type, packet_number=0, decode=False): def checkNotifyPacket(self, conn, packet_type, packet_number=0, decode=False):
""" Check if a notify-packet with the right type is sent """ """ Check if a notify-packet with the right type is sent """
calls = conn.mockGetNamedCalls('notify') calls = conn.mockGetNamedCalls('notify')
self.assertTrue(len(calls) > packet_number, (len(calls), packet_number)) packet = calls.pop(packet_number).getParam(0)
packet = calls[packet_number].getParam(0)
self.assertTrue(isinstance(packet, protocol.Packet)) self.assertTrue(isinstance(packet, protocol.Packet))
self.assertEqual(packet.getType(), packet_type) self.assertEqual(packet.getType(), packet_type)
if decode: if decode:
...@@ -564,7 +564,7 @@ class ClusterPdb(object): ...@@ -564,7 +564,7 @@ class ClusterPdb(object):
os.write(self._w, pack('d', delay)) os.write(self._w, pack('d', delay))
def sync(self): def sync(self):
"""Sleep as long as another process acquires the lock""" """Sleep as long as another process owns the lock"""
delay = self.acquire() delay = self.acquire()
self.release(delay) self.release(delay)
return delay return delay
......
neo/tests/client/testClientApp.py
View file @ c0b9f5b4
...@@ -20,7 +20,7 @@ from cPickle import dumps ...@@ -20,7 +20,7 @@ from cPickle import dumps
from mock import Mock, ReturnValues from mock import Mock, ReturnValues
from ZODB.POSException import StorageTransactionError, UndoError, ConflictError from ZODB.POSException import StorageTransactionError, UndoError, ConflictError
from neo.tests import NeoUnitTestBase, buildUrlFromString, ADDRESS_TYPE from neo.tests import NeoUnitTestBase, buildUrlFromString, ADDRESS_TYPE
from neo.client.app import Application, RevisionIndex from neo.client.app import Application
from neo.client.exception import NEOStorageError, NEOStorageNotFoundError from neo.client.exception import NEOStorageError, NEOStorageNotFoundError
from neo.client.exception import NEOStorageDoesNotExistError from neo.client.exception import NEOStorageDoesNotExistError
from neo.lib.protocol import Packet, Packets, Errors, INVALID_TID, \ from neo.lib.protocol import Packet, Packets, Errors, INVALID_TID, \
...@@ -46,8 +46,8 @@ def getPartitionTable(self): ...@@ -46,8 +46,8 @@ def getPartitionTable(self):
return self.pt return self.pt
def _ask(self, conn, packet, handler=None): def _ask(self, conn, packet, handler=None):
conn.ask(packet)
self.setHandlerData(None) self.setHandlerData(None)
conn.ask(packet)
if handler is None: if handler is None:
raise NotImplementedError raise NotImplementedError
else: else:
...@@ -92,17 +92,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -92,17 +92,6 @@ class ClientApplicationTests(NeoUnitTestBase):
txn_context['ttid'] = tid txn_context['ttid'] = tid
return txn_context return txn_context
def checkAskPacket(self, conn, packet_type, decode=False):
calls = conn.mockGetNamedCalls('ask')
self.assertEqual(len(calls), 1)
# client connection got queue as first parameter
packet = calls[0].getParam(0)
self.assertTrue(isinstance(packet, Packet))
self.assertEqual(packet.getType(), packet_type)
if decode:
return packet.decode()
return packet
def getApp(self, master_nodes=None, name='test', **kw): def getApp(self, master_nodes=None, name='test', **kw):
connector = SOCKET_CONNECTORS_DICT[ADDRESS_TYPE] connector = SOCKET_CONNECTORS_DICT[ADDRESS_TYPE]
if master_nodes is None: if master_nodes is None:
...@@ -192,167 +181,58 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -192,167 +181,58 @@ class ClientApplicationTests(NeoUnitTestBase):
def test_load(self): def test_load(self):
app = self.getApp() app = self.getApp()
mq = app.mq_cache cache = app._cache
oid = self.makeOID() oid = self.makeOID()
tid1 = self.makeTID(1) tid1 = self.makeTID(1)
tid2 = self.makeTID(2) tid2 = self.makeTID(2)
snapshot_tid = self.makeTID(3) tid3 = self.makeTID(3)
an_object = (1, oid, tid1, tid2, 0, makeChecksum('OBJ'), 'OBJ', None) tid4 = self.makeTID(4)
# connection to SN close # connection to SN close
self.assertTrue((oid, tid1) not in mq) self.assertFalse(oid in cache._oid_dict)
self.assertTrue((oid, tid2) not in mq) conn = Mock({'getAddress': ('', 0)})
packet = Errors.OidNotFound('') app.cp = Mock({'iterateForObject': [(Mock(), conn)]})
packet.setId(0) def fakeReceived(packet):
cell = Mock({ 'getUUID': '\x00' * 16}) packet.setId(0)
conn = Mock({'getUUID': '\x10' * 16, conn.fakeReceived = iter((packet,)).next
'getAddress': ('127.0.0.1', 0), def fakeObject(oid, serial, next_serial, data):
'fakeReceived': packet, fakeReceived(Packets.AnswerObject(oid, serial, next_serial, 0,
}) makeChecksum(data), data, None))
#app.local_var.queue = Mock({'get' : ReturnValues( return data, serial, next_serial
# (conn, None), (conn, packet)
#)}) fakeReceived(Errors.OidNotFound(''))
app.pt = Mock({ 'getCellListForOID': [cell, ], })
app.cp = self.getConnectionPool([(Mock(), conn)])
#Application._waitMessage = self._waitMessage #Application._waitMessage = self._waitMessage
# XXX: test disabled because of an infinite loop # XXX: test disabled because of an infinite loop
# self.assertRaises(NEOStorageError, app.load, snapshot_tid, oid) # self.assertRaises(NEOStorageError, app.load, oid, None, tid2)
# self.checkAskObject(conn) # self.checkAskObject(conn)
#Application._waitMessage = _waitMessage #Application._waitMessage = _waitMessage
# object not found in NEO -> NEOStorageNotFoundError # object not found in NEO -> NEOStorageNotFoundError
self.assertTrue((oid, tid1) not in mq) self.assertFalse(oid in cache._oid_dict)
self.assertTrue((oid, tid2) not in mq)
packet = Errors.OidNotFound('') fakeReceived(Errors.OidNotFound(''))
packet.setId(0) self.assertRaises(NEOStorageNotFoundError, app.load, oid)
cell = Mock({ 'getUUID': '\x00' * 16})
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.pt = Mock({ 'getCellListForOID': [cell, ], })
app.cp = self.getConnectionPool([(Mock(), conn)])
self.assertRaises(NEOStorageNotFoundError, app.load, snapshot_tid, oid)
self.checkAskObject(conn)
# object found on storage nodes and put in cache
packet = Packets.AnswerObject(*an_object[1:])
packet.setId(0)
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.cp = self.getConnectionPool([(Mock(), conn)])
answer_barrier = Packets.AnswerBarrier()
answer_barrier.setId(1)
app.master_conn = Mock({
'getNextId': 1,
'fakeReceived': answer_barrier,
})
result = app.load(snapshot_tid, oid)[:2]
self.assertEqual(result, ('OBJ', tid1))
self.checkAskObject(conn) self.checkAskObject(conn)
self.assertTrue((oid, tid1) in mq)
# object is now cached, try to reload it
conn = Mock({
'getAddress': ('127.0.0.1', 0),
})
app.cp = Mock({ 'getConnForCell' : conn})
result = app.load(snapshot_tid, oid)[:2]
self.assertEqual(result, ('OBJ', tid1))
self.checkNoPacketSent(conn)
def test_loadSerial(self): r1 = fakeObject(oid, tid1, tid3, 'FOO')
app = self.getApp() self.assertEqual(r1, app.load(oid, None, tid2))
mq = app.mq_cache
oid = self.makeOID()
tid1 = self.makeTID(1)
tid2 = self.makeTID(2)
snapshot_tid = self.makeTID(3)
def loadSerial(oid, serial):
return app.load(snapshot_tid, oid, serial=serial)[0]
# object not found in NEO -> NEOStorageNotFoundError
self.assertTrue((oid, tid1) not in mq)
self.assertTrue((oid, tid2) not in mq)
packet = Errors.OidNotFound('')
packet.setId(0)
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.pt = Mock({ 'getCellListForOID': [Mock()]})
app.cp = self.getConnectionPool([(Mock(), conn)])
self.assertRaises(NEOStorageNotFoundError, loadSerial, oid, tid2)
self.checkAskObject(conn) self.checkAskObject(conn)
# object should not have been cached for t in tid2, tid3:
self.assertFalse((oid, tid2) in mq) self.assertEqual(cache._load(oid, t).tid, tid1)
# now a cached version ewxists but should not be hit self.assertEqual(r1, app.load(oid, tid1))
mq.store((oid, tid2), ('WRONG', None)) self.assertEqual(r1, app.load(oid, None, tid3))
self.assertTrue((oid, tid2) in mq) self.assertRaises(StandardError, app.load, oid, tid2)
another_object = (1, oid, tid2, INVALID_TID, 0, self.assertRaises(StopIteration, app.load, oid)
makeChecksum('RIGHT'), 'RIGHT', None)
packet = Packets.AnswerObject(*another_object[1:])
packet.setId(0)
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.cp = self.getConnectionPool([(Mock(), conn)])
result = loadSerial(oid, tid1)
self.assertEqual(result, 'RIGHT')
self.checkAskObject(conn) self.checkAskObject(conn)
self.assertTrue((oid, tid2) in mq)
def test_loadBefore(self): r2 = fakeObject(oid, tid3, None, 'BAR')
app = self.getApp() self.assertEqual(r2, app.load(oid, None, tid4))
mq = app.mq_cache
oid = self.makeOID()
tid1 = self.makeTID(1)
tid2 = self.makeTID(2)
tid3 = self.makeTID(3)
snapshot_tid = self.makeTID(4)
def loadBefore(oid, tid):
return app.load(snapshot_tid, oid, tid=tid)
# object not found in NEO -> NEOStorageDoesNotExistError
self.assertTrue((oid, tid1) not in mq)
self.assertTrue((oid, tid2) not in mq)
packet = Errors.OidDoesNotExist('')
packet.setId(0)
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.pt = Mock({ 'getCellListForOID': [Mock()]})
app.cp = self.getConnectionPool([(Mock(), conn)])
self.assertRaises(NEOStorageDoesNotExistError, loadBefore, oid, tid2)
self.checkAskObject(conn) self.checkAskObject(conn)
# no visible version -> NEOStorageNotFoundError self.assertEqual(r2, app.load(oid))
an_object = (1, oid, INVALID_TID, None, 0, 0, '', None) self.assertEqual(r2, app.load(oid, tid3))
packet = Packets.AnswerObject(*an_object[1:])
packet.setId(0) cache.invalidate(oid, tid4)
conn = Mock({ self.assertRaises(StopIteration, app.load, oid)
'__str__': 'FakeConn',
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.cp = self.getConnectionPool([(Mock(), conn)])
self.assertRaises(NEOStorageError, loadBefore, oid, tid1)
# object should not have been cached
self.assertFalse((oid, tid1) in mq)
# as for loadSerial, the object is cached but should be loaded from db
mq.store((oid, tid1), ('WRONG', tid2))
self.assertTrue((oid, tid1) in mq)
app.cache_revision_index.invalidate([oid], tid2)
another_object = (1, oid, tid2, tid3, 0, makeChecksum('RIGHT'),
'RIGHT', None)
packet = Packets.AnswerObject(*another_object[1:])
packet.setId(0)
conn = Mock({
'getAddress': ('127.0.0.1', 0),
'fakeReceived': packet,
})
app.cp = self.getConnectionPool([(Mock(), conn)])
result = loadBefore(oid, tid3)
self.assertEqual(result, ('RIGHT', tid2, tid3))
self.checkAskObject(conn) self.checkAskObject(conn)
self.assertTrue((oid, tid1) in mq) self.assertEqual(len(cache._oid_dict[oid]), 2)
def test_tpc_begin(self): def test_tpc_begin(self):
app = self.getApp() app = self.getApp()
...@@ -690,9 +570,9 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -690,9 +570,9 @@ class ClientApplicationTests(NeoUnitTestBase):
def pending(self, queue): def pending(self, queue):
return not queue.empty() return not queue.empty()
app.dispatcher = Dispatcher() app.dispatcher = Dispatcher()
def load(snapshot_tid, oid, serial): def load(oid, tid, before_tid):
self.assertEqual(oid, oid0) self.assertEqual(oid, oid0)
return ({tid0: 'dummy', tid2: 'cdummy'}[serial], None, None) return ({tid0: 'dummy', tid2: 'cdummy'}[tid], None, None)
app.load = load app.load = load
store_marker = [] store_marker = []
def _store(txn_context, oid, serial, data, data_serial=None, def _store(txn_context, oid, serial, data, data_serial=None,
...@@ -1057,90 +937,6 @@ class ClientApplicationTests(NeoUnitTestBase): ...@@ -1057,90 +937,6 @@ class ClientApplicationTests(NeoUnitTestBase):
self.assertEqual(marker[0].getType(), Packets.AskPack) self.assertEqual(marker[0].getType(), Packets.AskPack)
# XXX: how to validate packet content ? # XXX: how to validate packet content ?
def test_RevisionIndex_1(self):
# Test add, getLatestSerial, getSerialList and clear
# without invalidations
oid1 = self.getOID(1)
oid2 = self.getOID(2)
tid1 = self.getOID(1)
tid2 = self.getOID(2)
tid3 = self.getOID(3)
ri = RevisionIndex()
# index is empty
self.assertEqual(ri.getSerialList(oid1), [])
ri.add((oid1, tid1))
# now, it knows oid1 at tid1
self.assertEqual(ri.getLatestSerial(oid1), tid1)
self.assertEqual(ri.getSerialList(oid1), [tid1])
self.assertEqual(ri.getSerialList(oid2), [])
ri.add((oid1, tid2))
# and at tid2
self.assertEqual(ri.getLatestSerial(oid1), tid2)
self.assertEqual(ri.getSerialList(oid1), [tid2, tid1])
ri.remove((oid1, tid1))
# oid1 at tid1 was pruned from cache
self.assertEqual(ri.getLatestSerial(oid1), tid2)
self.assertEqual(ri.getSerialList(oid1), [tid2])
ri.remove((oid1, tid2))
# oid1 is completely priuned from cache
self.assertEqual(ri.getLatestSerial(oid1), None)
self.assertEqual(ri.getSerialList(oid1), [])
ri.add((oid1, tid2))
ri.add((oid1, tid1))
# oid1 is populated, but in non-chronological order, check index
# still answers consistent result.
self.assertEqual(ri.getLatestSerial(oid1), tid2)
self.assertEqual(ri.getSerialList(oid1), [tid2, tid1])
ri.add((oid2, tid3))
# which is not affected by the addition of oid2 at tid3
self.assertEqual(ri.getLatestSerial(oid1), tid2)
self.assertEqual(ri.getSerialList(oid1), [tid2, tid1])
ri.clear()
# index is empty again
self.assertEqual(ri.getSerialList(oid1), [])
self.assertEqual(ri.getSerialList(oid2), [])
def test_RevisionIndex_2(self):
# Test getLatestSerial & getSerialBefore with invalidations
oid1 = self.getOID(1)
tid1 = self.getOID(1)
tid2 = self.getOID(2)
tid3 = self.getOID(3)
tid4 = self.getOID(4)
tid5 = self.getOID(5)
tid6 = self.getOID(6)
ri = RevisionIndex()
ri.add((oid1, tid1))
ri.add((oid1, tid2))
self.assertEqual(ri.getLatestSerial(oid1), tid2)
self.assertEqual(ri.getSerialBefore(oid1, tid2), tid1)
self.assertEqual(ri.getSerialBefore(oid1, tid3), tid2)
self.assertEqual(ri.getSerialBefore(oid1, tid4), tid2)
ri.invalidate([oid1], tid3)
# We don't have the latest data in cache, return None
self.assertEqual(ri.getLatestSerial(oid1), None)
self.assertEqual(ri.getSerialBefore(oid1, tid2), tid1)
self.assertEqual(ri.getSerialBefore(oid1, tid3), tid2)
# There is a gap between the last version we have and requested one,
# return None
self.assertEqual(ri.getSerialBefore(oid1, tid4), None)
ri.add((oid1, tid3))
# No gap anymore, tid3 found.
self.assertEqual(ri.getLatestSerial(oid1), tid3)
self.assertEqual(ri.getSerialBefore(oid1, tid4), tid3)
ri.invalidate([oid1], tid4)
ri.invalidate([oid1], tid5)
# A bigger gap...
self.assertEqual(ri.getLatestSerial(oid1), None)
self.assertEqual(ri.getSerialBefore(oid1, tid5), None)
self.assertEqual(ri.getSerialBefore(oid1, tid6), None)
# not entirely filled.
ri.add((oid1, tid5))
# Still, we know the latest and what is before tid6
self.assertEqual(ri.getLatestSerial(oid1), tid5)
self.assertEqual(ri.getSerialBefore(oid1, tid5), None)
self.assertEqual(ri.getSerialBefore(oid1, tid6), tid5)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
neo/tests/client/testMasterHandler.py
View file @ c0b9f5b4
...@@ -156,21 +156,17 @@ class MasterNotificationsHandlerTests(MasterHandlerTests): ...@@ -156,21 +156,17 @@ class MasterNotificationsHandlerTests(MasterHandlerTests):
conn = self.getConnection() conn = self.getConnection()
tid = self.getNextTID() tid = self.getNextTID()
oid1, oid2, oid3 = self.getOID(1), self.getOID(2), self.getOID(3) oid1, oid2, oid3 = self.getOID(1), self.getOID(2), self.getOID(3)
self.app.mq_cache = { self.app._cache = Mock({
(oid1, tid): ('bla', None),
(oid2, tid): ('bla', None),
}
self.app.cache_revision_index = Mock({
'invalidate': None, 'invalidate': None,
}) })
self.handler.invalidateObjects(conn, tid, [oid1, oid3]) self.handler.invalidateObjects(conn, tid, [oid1, oid3])
cache_calls = self.app.cache_revision_index.mockGetNamedCalls( cache_calls = self.app._cache.mockGetNamedCalls('invalidate')
'invalidate') self.assertEqual(len(cache_calls), 2)
self.assertEqual(len(cache_calls), 1) cache_calls[0].checkArgs(oid1, tid)
cache_calls[0].checkArgs([oid1, oid3], tid) cache_calls[1].checkArgs(oid3, tid)
invalidation_calls = self.db.mockGetNamedCalls('invalidate') invalidation_calls = self.db.mockGetNamedCalls('invalidate')
self.assertEqual(len(invalidation_calls), 1) self.assertEqual(len(invalidation_calls), 1)
invalidation_calls[0].checkArgs(tid, {oid1:tid, oid3:tid}) invalidation_calls[0].checkArgs(tid, [oid1, oid3])
def test_notifyPartitionChanges(self): def test_notifyPartitionChanges(self):
conn = self.getConnection() conn = self.getConnection()
......
neo/tests/master/testMasterApp.py
View file @ c0b9f5b4
...@@ -87,7 +87,7 @@ class MasterAppTests(NeoUnitTestBase): ...@@ -87,7 +87,7 @@ class MasterAppTests(NeoUnitTestBase):
self.app.broadcastNodesInformation([s_node]) self.app.broadcastNodesInformation([s_node])
# check conn # check conn
self.checkNotifyNodeInformation(client_conn) self.assertFalse(client_conn.mockGetNamedCalls('notify'))
self.checkNoPacketSent(master_conn) self.checkNoPacketSent(master_conn)
self.checkNotifyNodeInformation(storage_conn) self.checkNotifyNodeInformation(storage_conn)
......
neo/tests/storage/testStorageDBTests.py
View file @ c0b9f5b4
...@@ -189,7 +189,7 @@ class StorageDBTests(NeoUnitTestBase): ...@@ -189,7 +189,7 @@ class StorageDBTests(NeoUnitTestBase):
# two commited versions # two commited versions
self.db.finishTransaction(tid2) self.db.finishTransaction(tid2)
self.assertEqual(self.db.getObject(oid1), OBJECT_T2) self.assertEqual(self.db.getObject(oid1), OBJECT_T2)
self.assertEqual(self.db.getObject(oid1, tid1), OBJECT_T1_NO_NEXT) self.assertEqual(self.db.getObject(oid1, tid1), OBJECT_T1_NEXT)
self.assertEqual(self.db.getObject(oid1, before_tid=tid1), self.assertEqual(self.db.getObject(oid1, before_tid=tid1),
FOUND_BUT_NOT_VISIBLE) FOUND_BUT_NOT_VISIBLE)
self.assertEqual(self.db.getObject(oid1, tid2), OBJECT_T2) self.assertEqual(self.db.getObject(oid1, tid2), OBJECT_T2)
......
neo/tests/storage/testVerificationHandler.py
View file @ c0b9f5b4
...@@ -97,7 +97,6 @@ class StorageVerificationHandlerTests(NeoUnitTestBase): ...@@ -97,7 +97,6 @@ class StorageVerificationHandlerTests(NeoUnitTestBase):
'getLastTID': p64(4), 'getLastTID': p64(4),
}) })
self.verification.askLastIDs(conn) self.verification.askLastIDs(conn)
self.checkAnswerLastIDs(conn)
oid, tid, ptid = self.checkAnswerLastIDs(conn, decode=True) oid, tid, ptid = self.checkAnswerLastIDs(conn, decode=True)
self.assertEqual(oid, last_oid) self.assertEqual(oid, last_oid)
self.assertEqual(u64(tid), 4) self.assertEqual(u64(tid), 4)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7