SF.net SVN: fclient: [362] trunk/sandbox/fcp2/test_fcp/test_client.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient: [362] trunk/sandbox/fcp2/test_fcp/test_client.py
|
From: <jU...@us...> - 2008-03-11 01:04:01
|
Revision: 362
http://fclient.svn.sourceforge.net/fclient/?rev=362&view=rev
Author: jUrner
Date: 2008-03-10 18:04:02 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
continued rewriting tests
Modified Paths:
--------------
trunk/sandbox/fcp2/test_fcp/test_client.py
Modified: trunk/sandbox/fcp2/test_fcp/test_client.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_client.py 2008-03-11 01:03:34 UTC (rev 361)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py 2008-03-11 01:04:02 UTC (rev 362)
@@ -41,12 +41,12 @@
class BaseTestClient(unittest.TestCase):
"""Base class for all tests"""
- fcpClient = Client(
+ client = Client(
#debugVerbosity=Client.consts.DebugVerbosity.Debug
debugVerbosity=Client.consts.DebugVerbosity.Quiet
)
- fcpClient.ioHandler.setIOPrototype(DummyIO)
+ client.ioHandler.setIOPrototype(DummyIO)
def __init__(self, *args, **kwargs):
@@ -65,7 +65,7 @@
def connectClient(self):
"""Connects to the client"""
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
msg = self.getNextMessage()
if msg is not None:
self.failUnless(msg.name == 'ClientHello')
@@ -75,7 +75,7 @@
Build='9999999999',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
ExRevision='9999999999',
Testnet='false',
@@ -87,7 +87,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientConnected,
+ self.client.events.ClientConnected,
consts.Message.NodeHello,
)
self.assertHasNextEvent(None)
@@ -97,9 +97,9 @@
def closeClient(self):
"""Closes the client"""
- self.fcpClient.close()
+ self.client.close()
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.Close),
)
@@ -262,9 +262,9 @@
else:
msgClass = message.newMessageType(messageName)
msg = msgClass(data=data, **params)
- self.fcpClient.ioHandler.io.readBuffer += msg.toString()
+ self.client.ioHandler.io.readBuffer += msg.toString()
if callNext:
- self.fcpClient.next()
+ self.client.next()
#NOTE: iohandler is buffered
@@ -278,40 +278,40 @@
# cheat a bit to get iohandler to read a message from writeBuffer
if self.ioOpen():
- self.fcpClient.ioHandler.io.setReverseDirection(True)
+ self.client.ioHandler.io.setReverseDirection(True)
try:
- msg = self.fcpClient.ioHandler.readMessage()
- except iohandler.IOTimeout:
+ msg = self.client.ioHandler.readMessage()
+ except self.client.ioHandler.IOTimeout:
return None
finally:
- self.fcpClient.ioHandler.io.setReverseDirection(False)
+ self.client.ioHandler.io.setReverseDirection(False)
return msg
def ioOpen(self):
"""Checks if the clients io is open"""
- return self.fcpClient.ioHandler.isOpen()
+ return self.client.ioHandler.isOpen()
def getIO(self):
"""Returns the clients io"""
- return self.fcpClient.ioHandler.io
+ return self.client.ioHandler.io
def setUp(self):
# conect all events
self.events = [] # events received from the client
- for event in self.fcpClient.events:
+ for event in self.client.events:
event += self._captureEventsFromClient
def tearDown(self):
# disconnect all events
- for event in self.fcpClient.events:
+ for event in self.client.events:
event -= self._captureEventsFromClient
# clean up tmpfiles
for fpath in self.tmpfiles: os.remove(fpath)
- if self.fcpClient.isOpen():
- self.fcpClient.close()
+ if self.client.isOpen():
+ self.client.close()
#***********************************************************************************
@@ -325,9 +325,9 @@
class Test_close(BaseTestClient):
def test_close(self):
- self.fcpClient.close()
+ self.client.close()
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.Close),
)
@@ -339,11 +339,11 @@
class Test_isOpen(BaseTestClient):
def test_isOpen(self):
- self.failIf(self.fcpClient.isOpen())
+ self.failIf(self.client.isOpen())
self.connectClient()
- self.failUnless(self.fcpClient.isOpen())
+ self.failUnless(self.client.isOpen())
self.closeClient()
- self.failIf(self.fcpClient.isOpen())
+ self.failIf(self.client.isOpen())
#***********************************************************************************
#TODO: not idea how to test this
@@ -358,7 +358,7 @@
class Test_iterConnect(BaseTestClient):
def test_iterConnect_success(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
msg = self.getNextMessage()
if msg is not None:
self.failUnless(msg.name == 'ClientHello')
@@ -366,7 +366,7 @@
'NodeHello',
FCPVersion='2.0',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
Build='9999999999',
ExRevision='9999999999',
@@ -379,22 +379,22 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientConnected,
+ self.client.events.ClientConnected,
consts.Message.NodeHello,
)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
self.failUnless(self.ioOpen())
- self.fcpClient.close()
+ self.client.close()
def test_iterConnect_ioRefusesConnection(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.getIO().setAllowConnect(False)
self.failUnless(nodeHello is None)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.IOConnectFailed),
)
@@ -404,12 +404,12 @@
def test_iterConnect_nodeHelloNeverArrives(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
pass
self.failUnless(nodeHello is None)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.NoNodeHello),
)
@@ -419,17 +419,17 @@
def test_iterConnect_socketDies(self):
- enum = self.fcpClient.iterConnect(duration=0.2, timeout=0.1)
+ enum = self.client.iterConnect(duration=0.2, timeout=0.1)
errorRaised = False
while True:
try:
enum.next()
except StopIteration:
break
- except iohandler.IOBroken, d:
+ except self.client.ioHandler.IOBroken, d:
errorRaised = True
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.ConnectionDied),
#('Param', None),
@@ -445,7 +445,7 @@
def test_iterIterConnect_unknownNodehello(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.sendResponseMessage(
'i-am-invalid',
callNext=False,
@@ -453,7 +453,7 @@
self.failUnless(nodeHello is None)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.UnknownNodeHello),
)
@@ -463,14 +463,14 @@
def test_iterIterConnect_connect(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.sendResponseMessage(
'NodeHello',
FCPVersion='2.0',
Build='9999999999',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
ExRevision='9999999999',
Testnet='false',
@@ -482,7 +482,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientConnected,
+ self.client.events.ClientConnected,
consts.Message.NodeHello,
)
self.assertHasNextEvent(None)
@@ -494,14 +494,14 @@
def test_iterIterConnect_reconnect(self):
self.connectClient()
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.sendResponseMessage(
'NodeHello',
FCPVersion='2.0',
Build='9999999999',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
ExRevision='9999999999',
Testnet='false',
@@ -513,12 +513,12 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.Reconnect)
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientConnected,
+ self.client.events.ClientConnected,
consts.Message.NodeHello,
)
self.assertHasNextEvent(None)
@@ -528,14 +528,14 @@
def test_iterIterConnect_VersionMissmatch_FCPVersion(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.sendResponseMessage(
'NodeHello',
FCPVersion='0.0',
Build='9999999999',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
ExRevision='9999999999',
Testnet='false',
@@ -547,7 +547,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.VersionMissmatch)
)
@@ -558,14 +558,14 @@
def test_iterIterConnect_VersionMissmatch_Build(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=0.2, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=0.2, timeout=0.1)):
self.sendResponseMessage(
'NodeHello',
FCPVersion='2.0',
Build='0',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='999999999999',
ExRevision='9999999999',
Testnet='false',
@@ -577,7 +577,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.VersionMissmatch)
)
@@ -599,7 +599,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.DuplicateClientName)
)
@@ -615,7 +615,7 @@
def test_closeNode(self):
self.connectClient()
- self.fcpClient.closeNode()
+ self.client.closeNode()
self.assertHasNextMessage('Shutdown')
self.sendResponseMessage(
'ProtocolError',
@@ -623,7 +623,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.NodeClosing)
)
@@ -632,7 +632,237 @@
self.failIf(self.ioOpen())
self.closeClient()
+#***********************************************************************************
+# TODO: no idea how t test this
+#***********************************************************************************
+class Test_startNode(BaseTestClient):
+ pass
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_get_setConnectionName(BaseTestClient):
+
+ def test_get_setConnectionName(self):
+
+ self.failIf(self.client.setConnectionName() == 'foo')
+ self.client.setConnectionName('foo')
+ self.failIf(self.client.getConnectionName() != 'foo')
+
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_get_setDebugVerbosity(BaseTestClient):
+
+
+ def test_get_setDebugVerbosity(self):
+ oldVerbosity = self.client.getDebugVerbosity()
+ self.client.setDebugVerbosity(self.client.consts.DebugVerbosity.Quiet)
+ self.client.setDebugVerbosity(oldVerbosity)
+
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_versionCheckNodeHello(BaseTestClient):
+
+
+ def test_get_versionCheckNodeHello(self):
+
+ msg = {
+ 'FCPVersion': self.client.ExpectedFcpVersion,
+ 'Build':self.client.ExpectedNodeBuild,
+ }
+ result = self.client.versionCheckNodeHello(msg)
+ self.failUnless(result == True)
+
+ msg = {
+ 'FCPVersion': self.client.ExpectedFcpVersion -1,
+ 'Build':self.client.ExpectedNodeBuild,
+ }
+ result = self.client.versionCheckNodeHello(msg)
+ self.failUnless(result == False)
+
+ msg = {
+ 'FCPVersion': self.client.ExpectedFcpVersion,
+ 'Build':self.client.ExpectedNodeBuild -1,
+ }
+ result = self.client.versionCheckNodeHello(msg)
+ self.failUnless(result == False)
+
+ msg = {
+ 'FCPVersion': self.client.ExpectedFcpVersion +1,
+ 'Build':self.client.ExpectedNodeBuild,
+ }
+ result = self.client.versionCheckNodeHello(msg)
+ self.failUnless(result == False)
+
+ msg = {
+ 'FCPVersion': self.client.ExpectedFcpVersion,
+ 'Build':self.client.ExpectedNodeBuild +1,
+ }
+ result = self.client.versionCheckNodeHello(msg)
+ self.failUnless(result == True)
+
+#***********************************************************************************
+# TODO: not tested
+#***********************************************************************************
+class Test_handleMessage(BaseTestClient):
+ pass
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_next(BaseTestClient):
+
+ def test_idle(self):
+ self.connectClient()
+ msg = self.client.next()
+ msg2 = self.assertHasNextEvent(
+ self.client.events.Idle,
+ self.client.message.ClientSocketTimeout.name,
+ )
+ self.failUnless(msg == msg2)
+
+
+ def test_io_broken(self):
+ self.connectClient()
+ self.getIO().setBroken(True)
+
+ self.assertRaises(self.client.ioHandler.IOBroken, self.client.next, )
+ self.assertHasNextEvent(
+ self.client.events.ClientDisconnected,
+ consts.Message.ClientDisconnected,
+ ('DisconnectReason', consts.DisconnectReason.ConnectionDied)
+ )
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failIf(self.ioOpen())
+
+
+ def test_hasMessage(self):
+ self.connectClient()
+ self.sendResponseMessage(
+ 'HiThere',
+ callNext=False
+ )
+ msg = self.client.next()
+ self.assertEqual(msg.name, 'HiThere')
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failUnless(self.ioOpen())
+
+
+#***********************************************************************************
+#TODO: not tested yet
+#***********************************************************************************
+class Test_run(BaseTestClient):
+
+ pass
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_sendMessage(BaseTestClient):
+
+ def test_io_broken(self):
+ self.connectClient()
+ self.getIO().setBroken(True)
+
+ self.assertRaises(self.client.ioHandler.IOBroken, self.client.sendMessage, self.client.message.ClientHello())
+ self.assertHasNextEvent(
+ self.client.events.ClientDisconnected,
+ consts.Message.ClientDisconnected,
+ ('DisconnectReason', consts.DisconnectReason.ConnectionDied)
+ )
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failIf(self.ioOpen())
+
+
+ def test_messageSend(self):
+ self.connectClient()
+ self.client.sendMessage(self.client.message.ClientHello())
+ msg = self.client.next()
+ self.assertHasNextMessage('ClientHello')
+ self.assertHasNextEvent(self.client.events.Idle)
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failUnless(self.ioOpen())
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_getConfig(BaseTestClient):
+
+ def test_getConfig(self):
+ self.connectClient()
+ self.client.getConfig(
+ withCurrent=True,
+ withDefaults=True,
+ withExpertFlag=True,
+ withForceWriteFlag=True,
+ withSortOrder=True,
+ withShortDescription=True,
+ withLongDescription=True,
+ withDataTypes=True,
+ )
+ msg = self.client.next()
+ self.assertHasNextMessage('GetConfig',
+ ('WithCurrent', True),
+ ('WithDefaults', True),
+ ('WithExpertFlag', True),
+ ('WithForceWriteFlag', True),
+ ('WithSortOrder', True),
+ ('WithShortDescription', True),
+ ('WithLongDescription', True),
+ ('WithDataTypes', True),
+ )
+ self.assertHasNextEvent(self.client.events.Idle)
+
+
+ self.sendResponseMessage('ConfigData',
+ foo='1234',
+ )
+ self.assertHasNextEvent(
+ self.client.events.ConfigData,
+ consts.Message.ConfigData,
+ ('foo', '1234')
+ )
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failUnless(self.ioOpen())
+
+#***********************************************************************************
+#
+#***********************************************************************************
+class Test_modifyConfig(BaseTestClient):
+
+ def test_getConfig(self):
+ self.connectClient()
+ self.client.modifyConfig(
+ {'foo': '1234'}
+ )
+ msg = self.client.next()
+ self.assertHasNextMessage('ModifyConfig',
+ ('foo', '1234'),
+ )
+ self.assertHasNextEvent(self.client.events.Idle)
+
+ self.assertHasNextEvent(None)
+ self.assertHasNextMessage(None)
+ self.failUnless(self.ioOpen())
+
+
+
+
###################################################
###################################################
###################################################
@@ -647,7 +877,7 @@
self.sendResponseMessage('CloseConnectionDuplicateClientName')
msg = self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.DuplicateClientName),
)
@@ -656,7 +886,7 @@
self.failIf(self.ioOpen())
self.assertHasNextEvent(None)
- #print self.fcpClient.test_messagesSend[0].name
+ #print self.client.test_messagesSend[0].name
self.assertHasNextMessage(None)
self.connectClient()
@@ -665,11 +895,11 @@
def test_1001_SocketDied_Receive(self):
self.getIO().setBroken(True)
- self.assertRaises(iohandler.IOBroken, self.fcpClient.next)
+ self.assertRaises(iohandler.IOBroken, self.client.next)
# check if ClientDisconnected events has been triggered
msg = self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.SocketDied),
#('Param', ClientSocketDiedMessage) # can not test here
@@ -689,11 +919,11 @@
self.getIO().setBroken(True)
# send a test message
- self.assertRaises(iohandler.IOBroken, self.fcpClient.sendMessage, message.newMessageType('test')())
+ self.assertRaises(iohandler.IOBroken, self.client.sendMessage, message.newMessageType('test')())
# check if ClientDisconnected events has been triggered
msg = self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.SocketDied),
#('Param', ClientSocketDiedMessage) # can not test here
@@ -710,7 +940,7 @@
def test_1003_Shutdown(self):
- self.fcpClient.closeFreenet()
+ self.client.closeFreenet()
msg = self.assertHasNextMessage(consts.Message.Shutdown)
self.sendResponseMessage(
@@ -720,7 +950,7 @@
# check events the client triggered
msg = self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.Shutdown)
#('Param', NodeHelloMessage) # can not test here
@@ -738,7 +968,7 @@
def test_1004_VersionMismatch(self):
- for n, nodeHello in enumerate(self.fcpClient.iterConnect(duration=1, timeout=0.1)):
+ for n, nodeHello in enumerate(self.client.iterConnect(duration=1, timeout=0.1)):
if n == 1:
self.assertHasNextMessage(
consts.Message.ClientHello
@@ -747,7 +977,7 @@
'NodeHello',
FCPVersion='0.0',
Node='Fred',
- Version=str(self.fcpClient.ExpectedFcpVersion),
+ Version=str(self.client.ExpectedFcpVersion),
Revision='0',
Build='0',
ExRevision='0',
@@ -761,7 +991,7 @@
# check events the client triggered
msg = self.assertHasNextEvent(
- self.fcpClient.events.ClientDisconnected,
+ self.client.events.ClientDisconnected,
consts.Message.ClientDisconnected,
('DisconnectReason', consts.DisconnectReason.VersionMissmatch)
#('Param', NodeHelloMessage) # can not test here
@@ -782,11 +1012,11 @@
def test_2000_ClientGetRegistered(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getData(
+ myIdentifier = self.client.getData(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
self.assertHasNextEvent(None)
@@ -806,11 +1036,11 @@
def test_2001_GetData_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getData(
+ myIdentifier = self.client.getData(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -833,7 +1063,7 @@
Succeeded=1,
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestProgress,
+ self.client.events.RequestProgress,
)
# finalize request
@@ -861,7 +1091,7 @@
# client should complete and remove the request
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -890,7 +1120,7 @@
# client should complete but not remove the request
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Success | consts.RequestStatus.Completed),
data=data
@@ -908,11 +1138,11 @@
def test_2002_GetData_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getData(
+ myIdentifier = self.client.getData(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -934,7 +1164,7 @@
# client should complete request and remove it
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -964,7 +1194,7 @@
# client should complete but not remove the request
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Error | consts.RequestStatus.Completed),
)
@@ -979,12 +1209,12 @@
def test_2003_GetFile_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitryry.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1008,7 +1238,7 @@
**params
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1026,12 +1256,12 @@
def test_2004_GetFile_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitryry.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1052,7 +1282,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1069,11 +1299,11 @@
def test_2005_GetKeyInfo_Success(self):
# request a arbitrary uri
- myIdentifier = self.fcpClient.getKeyInfo(
+ myIdentifier = self.client.getKeyInfo(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1097,7 +1327,7 @@
**params
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1116,11 +1346,11 @@
# test specdial case where ProtocolError.TooBig is handled as success
# request a arbitrary uri
- myIdentifier = self.fcpClient.getKeyInfo(
+ myIdentifier = self.client.getKeyInfo(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1140,7 +1370,7 @@
# blah.. more here
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1158,11 +1388,11 @@
def test_2007_GetKeyInfo_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getKeyInfo(
+ myIdentifier = self.client.getKeyInfo(
'arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1182,7 +1412,7 @@
# blah.. more here
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1207,12 +1437,12 @@
def testPutRedirect_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.putRedirect(
+ myIdentifier = self.client.putRedirect(
'my-redirect-name',
'SSK@arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1224,7 +1454,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1239,12 +1469,12 @@
def testPutRedirect_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.putRedirect(
+ myIdentifier = self.client.putRedirect(
'my-redirect-name',
'SSK@arbitrary-uri',
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1256,7 +1486,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1271,11 +1501,11 @@
def testCHKPutData_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutData(
+ myIdentifier = self.client.chkPutData(
'arbitrary data'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1287,7 +1517,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1302,11 +1532,11 @@
def testCHKPutData_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutData(
+ myIdentifier = self.client.chkPutData(
'arbitrary data'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1318,7 +1548,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1333,11 +1563,11 @@
def testCHKPutDir_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutDir(
+ myIdentifier = self.client.chkPutDir(
'myDirectory'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPutDiskDir)
self.failUnless(myIdentifier in requestsAll)
@@ -1349,7 +1579,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientPutDiskDir,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1364,11 +1594,11 @@
def testCHKPutDir_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutDir(
+ myIdentifier = self.client.chkPutDir(
'myDirectory'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPutDiskDir)
self.failUnless(myIdentifier in requestsAll)
@@ -1380,7 +1610,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientPutDiskDir,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1395,11 +1625,11 @@
def testCHKPutFile_Success(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutFile(
+ myIdentifier = self.client.chkPutFile(
'myFile.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1411,7 +1641,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1426,11 +1656,11 @@
def testCHKPutFile_Failure(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutFile(
+ myIdentifier = self.client.chkPutFile(
'myFile.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientPut)
self.failUnless(myIdentifier in requestsAll)
@@ -1442,7 +1672,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestFailed,
+ self.client.events.RequestFailed,
consts.Message.ClientPut,
('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
@@ -1482,11 +1712,11 @@
]
# request a arbitrary file
- myIdentifier = self.fcpClient.chkPutMultiple(
+ myIdentifier = self.client.chkPutMultiple(
items
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
msg = self.assertHasNextMessage(
consts.Message.ClientPutComplexDir,
@@ -1521,7 +1751,7 @@
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestCompleted,
+ self.client.events.RequestCompleted,
consts.Message.ClientPutComplexDir,
('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
@@ -1545,7 +1775,7 @@
'Name': 'myItem0',
},
]
- self.assertRaises(ValueError, self.fcpClient.chkPutMultiple, items)
+ self.assertRaises(ValueError, self.client.chkPutMultiple, items)
#TODO: how to test required params?
# ...just some samples below
@@ -1558,7 +1788,7 @@
'Name': 'myItem0',
},
]
- self.assertRaises(ValueError, self.fcpClient.chkPutMultiple, items)
+ self.assertRaises(ValueError, self.client.chkPutMultiple, items)
# param missing (we enforce all required parameters)
items = [
@@ -1568,12 +1798,12 @@
#'Name': 'myItem0',
},
]
- self.assertRaises(ValueError, self.fcpClient.chkPutMultiple, items)
+ self.assertRaises(ValueError, self.client.chkPutMultiple, items)
# some sloppy tests for other key types
def testSSKPutData(self):
- myIdentifier = self.fcpClient.chkPutData(
+ myIdentifier = self.client.chkPutData(
'arbitrary data'
)
@@ -1590,15 +1820,15 @@
def test_3000_ModifyRequest_Persistent(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitryry.txt',
persistentUserData='foo',
priorityClass=consts.Priority.Medium,
persistence=consts.Persistence.Reboot,
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1612,7 +1842,7 @@
# test modify persistent user data
- self.fcpClient.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=consts.Priority.High)
+ self.client.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=consts.Priority.High)
msg = self.assertHasNextMessage(consts.Message.ModifyPersistentRequest)
# respond to the file request
@@ -1620,7 +1850,7 @@
'PersistentRequestModified',
**msg.params
)
- self.assertHasNextEvent(self.fcpClient.events.RequestModified)
+ self.assertHasNextEvent(self.client.events.RequestModified)
self.failUnless(consts.RequestModified.PersistentUserData in myRequest['Modified'])
self.failUnless(consts.RequestModified.PriorityClass in myRequest['Modified'])
@@ -1637,14 +1867,14 @@
def test_3001_ModifyRequest_NonPersistent(self):
# request a arbitrary file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitryry.txt',
persistentUserData='foo',
priorityClass=consts.Priority.Medium,
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1656,7 +1886,7 @@
)
# test modify persistent user data
- self.fcpClient.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=consts.Priority.High)
+ self.client.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=consts.Priority.High)
# no way to modify priority in Fcp. The client ignores all attempts to do so currently
# no message is send,instead the event is triggered emidiately
@@ -1668,7 +1898,7 @@
# **msg.params
# )
- self.assertHasNextEvent(self.fcpClient.events.RequestModified)
+ self.assertHasNextEvent(self.client.events.RequestModified)
self.failUnless(consts.RequestModified.PersistentUserData in myRequest['Modified'])
#self.failUnless(consts.RequestModified.PriorityClass in myRequest['Modified'])
@@ -1685,12 +1915,12 @@
def test_3002_RemoveRequest_NonPersistent(self):
# request a file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitrary.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
# respond to the file request
@@ -1705,25 +1935,25 @@
self.messages = []
# now cancel request
- self.fcpClient.removeRequest(myIdentifier)
+ self.client.removeRequest(myIdentifier)
# of our request should be removed emidiately,
self.assertEqual(myRequest['RequestStatus'], consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
)
- self.failIf(myIdentifier in self.fcpClient.getRequests())
+ self.failIf(myIdentifier in self.client.getRequests())
# now the request should have been removed
self.assertHasNextEvent(
- self.fcpClient.events.RequestRemoved,
+ self.client.events.RequestRemoved,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
- self.failIf(self.fcpClient.getRequests())
+ self.failIf(self.client.getRequests())
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -1733,13 +1963,13 @@
def test_3003_RemoveRequest_persistent(self):
# request a file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitrary.txt',
persistence=consts.Persistence.Reboot,
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -1755,12 +1985,12 @@
self.messages = []
# now cancel request
- self.fcpClient.removeRequest(myIdentifier)
+ self.client.removeRequest(myIdentifier)
# status of our request should be set to removed emidiately, but it should
# not be removed from the client
self.assertEqual(myRequest['RequestStatus'], consts.RequestStatus.Removed | consts.RequestStatus.Completed)
- self.failUnless(myIdentifier in self.fcpClient.getRequests())
+ self.failUnless(myIdentifier in self.client.getRequests())
# client schould send a RemovePersistentRequest
self.assertHasNextMessage(consts.Message.RemovePersistentRequest)
@@ -1775,7 +2005,7 @@
self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.RemovedFromQueue)
self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(
- self.fcpClient.events.RequestRemoved,
+ self.client.events.RequestRemoved,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
@@ -1783,7 +2013,7 @@
),
)
- self.failIf(self.fcpClient.getRequests())
+ self.failIf(self.client.getRequests())
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -1793,19 +2023,19 @@
def test_3004_ResendRequest_NonPersistent(self):
- myIdentifier = self.fcpClient.getData('any-key')
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.getData('any-key')
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
- newIdentifier = self.fcpClient.resendRequest(myRequest)
+ newIdentifier = self.client.resendRequest(myRequest)
# client should remove old request emidiately
self.failIf(myIdentifier == newIdentifier)
self.failIf(myIdentifier in requestsAll)
self.failUnless(newIdentifier in requestsAll)
self.assertHasNextEvent(
- self.fcpClient.events.RequestRemoved,
+ self.client.events.RequestRemoved,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
@@ -1824,12 +2054,12 @@
def test_3005_ResendRequest_Persistent(self):
- myIdentifier = self.fcpClient.getData('any-key', persistence=consts.Persistence.Reboot)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.getData('any-key', persistence=consts.Persistence.Reboot)
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
- newIdentifier = self.fcpClient.resendRequest(myRequest)
+ newIdentifier = self.client.resendRequest(myRequest)
self.failIf(myIdentifier == newIdentifier)
self.failUnless(newIdentifier in requestsAll)
@@ -1847,7 +2077,7 @@
Identifier=myIdentifier,
)
self.assertHasNextEvent(
- self.fcpClient.events.RequestRemoved,
+ self.client.events.RequestRemoved,
consts.Message.ClientGet,
('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
@@ -1890,7 +2120,7 @@
('Identifier', myIdentifier)
)
- requests = self.fcpClient.getRequests()
+ requests = self.client.getRequests()
self.failIf(requests)
# the client should not trigger any events
@@ -1901,16 +2131,16 @@
def test_4001_RestorePersistentGet_ValidIdentifier(self):
# we need a valid identifier to restore a request, so hack a bit
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
'arbitryry.txt'
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.ClientGet)
- self.fcpClient.removeRequest(myIdentifier)
+ self.client.removeRequest(myIdentifier)
self.sendResponseMessage(
'PersistentRequestRemoved',
Identifier=myIdentifier,
@@ -1932,7 +2162,7 @@
# check if the client restored the request
msg = self.assertHasNextEvent(
- self.fcpClient.events.RequestRestored,
+ self.client.events.RequestRestored,
consts.Message.ClientGet,
('Identifier', myIdentifier),
('RequestStatus', consts.RequestStatus.Restored), # no RequestStatus.Pending flag should be set here
@@ -1957,12 +2187,12 @@
def test_5000_DDAWriteDenied(self):
# request a file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
os.path.join(DIR, 'DDATest.txt')
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
# client schould send a ClientGet
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -2035,7 +2265,7 @@
**msg.params
)
- requests = self.fcpClient.getRequests()
+ requests = self.client.getRequests()
self.assertEqual(len(requests), 1)
self.assertHasNextEvent(None)
@@ -2057,12 +2287,12 @@
def test_6000_IdentifierCollision(self):
# request a file
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
os.path.join(DIR, 'test.txt')
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
# client schould send a ClientGet
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -2079,7 +2309,7 @@
# check if RequestModified event has been triggered
msg = self.assertHasNextEvent(
- self.fcpClient.events.RequestModified,
+ self.client.events.RequestModified,
consts.Message.ClientGet,
)
@@ -2103,13 +2333,13 @@
open(fpath, 'wb').close()
self.tmpfiles.append(fpath)
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
fpath,
filenameCollision=consts.FilenameCollision.HandleRename,
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
# client schould send a ClientGet
self.assertHasNextMessage(consts.Message.ClientGet)
@@ -2127,7 +2357,7 @@
# client schould send a new ClientGet with a different filename
self.assertHasNextMessage(consts.Message.ClientGet)
msg = self.assertHasNextEvent(
- self.fcpClient.events.RequestModified,
+ self.client.events.RequestModified,
consts.Message.ClientGet
)
@@ -2157,19 +2387,19 @@
open(fpath, 'wb').close()
self.tmpfiles.append(fpath)
- myIdentifier = self.fcpClient.getFile(
+ myIdentifier = self.client.getFile(
'arbitrary-uri',
fpath,
filenameCollision=consts.FilenameCollision.HandleNever,
)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
# client schould send a ClientGet
self.assertHasNextMessage(consts.Message.ClientGet)
# check if our request was registered
- requests = self.fcpClient.getRequests()
+ requests = self.client.getRequests()
self.failUnless(len(requests) == 1)
# now respond with a ProtocolError
@@ -2183,10 +2413,10 @@
)
# client schould send no messages and trigger a RequestFailed event
- self.assertHasNextEvent(self.fcpClient.events.RequestFailed)
+ self.assertHasNextEvent(self.client.events.RequestFailed)
# request should have been removed
- self.failIf(self.fcpClient.getRequests())
+ self.failIf(self.client.getRequests())
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2209,11 +2439,11 @@
URI=myKey,
Persistence=consts.Persistence.Connection,
)
- self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+ self.client._registerRequest(msg, consts.RequestType.PutData)
myIdentifier = msg['Identifier']
- requestsAll = self.fcpClient.getRequests()
+ requestsAll = self.client.getRequests()
- newIdentifier = self.fcpClient.resendRequest(msg)
+ newIdentifier = self.client.resendRequest(msg)
self.failIf(myIdentifier in requestsAll)
self.failUnless(newIdentifier in requestsAll)
@@ -2229,12 +2459,12 @@
URI=myKey + '/foo',
Persistence=consts.Persistence.Connection,
)
- self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+ self.client._registerRequest(msg, consts.RequestType.PutData)
msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
- requestsAll = self.fcpClient.getRequests()
+ requestsAll = self.client.getRequests()
- newIdentifier = self.fcpClient.resendRequest(msg)
+ newIdentifier = self.client.resendRequest(msg)
self.failIf(myIdentifier in requestsAll)
self.failUnless(newIdentifier in requestsAll)
@@ -2251,12 +2481,12 @@
URI=myKey + '/foo/0',
Persistence=consts.Persistence.Connection,
)
- self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+ self.client._registerRequest(msg, consts.RequestType.PutData)
msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
- requestsAll = self.fcpClient.getRequests()
+ requestsAll = self.client.getRequests()
- newIdentifier = self.fcpClient.resendRequest(msg)
+ newIdentifier = self.client.resendRequest(msg)
self.failIf(myIdentifier in requestsAll)
self.failUnless(newIdentifier in requestsAll)
@@ -2272,12 +2502,12 @@
URI=myKey,
Persistence=consts.Persistence.Connection,
)
- self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
+ self.client._registerRequest(msg, consts.RequestType.PutData)
msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
- requestsAll = self.fcpClient.getRequests()
+ requestsAll = self.client.getRequests()
- newIdentifier = self.fcpClient.resendRequest(msg)
+ newIdentifier = self.client.resendRequest(msg)
self.failIf(myIdentifier in requestsAll)
self.failUnless(newIdentifier in requestsAll)
@@ -2312,9 +2542,9 @@
def testGet_8000_PluginInfo_Success(self):
- myIdentifier = self.fcpClient.getPluginInfo('hi there')
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.getPluginInfo('hi there')
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
self.assertHasNextMessage(
@@ -2330,7 +2560,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.PluginInfo,
+ self.client.events.PluginInfo,
consts.Message.GetPluginInfo,
('Identifier', myIdentifier),
('PluginName', 'hi there'),
@@ -2351,9 +2581,9 @@
def test_8001_GetPluginInfo_Failure(self):
- myIdentifier = self.fcpClient.getPluginInfo('hi there')
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.getPluginInfo('hi there')
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
self.assertHasNextMessage(
@@ -2369,7 +2599,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.PluginInfoFailed,
+ self.client.events.PluginInfoFailed,
consts.Message.GetPluginInfo,
#('PluginName', 'hi there'),
('Identifier', myIdentifier),
@@ -2391,8 +2621,8 @@
def test_8002_SendPluginMessage_Success(self):
myIdentifier = '123456789'
- myRequest = self.fcpClient.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
+ requestsAll = self.client.getRequests()
self.failIf(myIdentifier in requestsAll)
self.assertHasNextMessage(
@@ -2410,7 +2640,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.PluginMessage,
+ self.client.events.PluginMessage,
consts.Message.FCPPluginReply,
('PluginName', 'hi there'),
('Identifier', myIdentifier),
@@ -2425,8 +2655,8 @@
def test_8003_GetSendPluginMessage_Failure(self):
myIdentifier = '1234567889'
- myRequest = self.fcpClient.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
+ requestsAll = self.client.getRequests()
self.failIf(myIdentifier in requestsAll)
self.assertHasNextMessage(
@@ -2443,7 +2673,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.ProtocolError,
+ self.client.events.ProtocolError,
consts.Message.ProtocolError,
('Identifier', myIdentifier),
)
@@ -2457,8 +2687,8 @@
def test_8003_GetSendPluginMessage_Identifiercollision(self):
myIdentifier = '1234567889'
- myRequest = self.fcpClient.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
- requestsAll = self.fcpClient.getRequests()
+ myRequest = self.client.sendPluginMessage('hi there', myIdentifier, {'foo': "bar"})
+ requestsAll = self.client.getRequests()
self.failIf(myIdentifier in requestsAll)
self.assertHasNextMessage(
@@ -2474,7 +2704,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.IdentifierCollision,
+ self.client.events.IdentifierCollision,
consts.Message.IdentifierCollision,
('Identifier', myIdentifier),
)
@@ -2495,9 +2725,9 @@
class TestGenerateKeypair(BaseTestClient):
def test_10000_GeberateSSKKeypair(self):
- myIdentifier = self.fcpClient.generateKeypair(consts.KeyType.SSK)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.generateKeypair(consts.KeyType.SSK)
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.GenerateSSK)
self.sendResponseMessage(
@@ -2508,7 +2738,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.KeypairGenerated,
+ self.client.events.KeypairGenerated,
consts.Message.GenerateSSK,
('Identifier', myIdentifier),
('PublicKey','SSK@public'),
@@ -2527,9 +2757,9 @@
def test_10001_GeberateUSKKeypair(self):
- myIdentifier = self.fcpClient.generateKeypair(consts.KeyType.USK)
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.generateKeypair(consts.KeyType.USK)
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.assertHasNextMessage(consts.Message.GenerateSSK)
self.sendResponseMessage(
@@ -2540,7 +2770,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.KeypairGenerated,
+ self.client.events.KeypairGenerated,
consts.Message.GenerateSSK,
('Identifier', myIdentifier),
('PublicKey','USK@public'),
@@ -2566,9 +2796,9 @@
def test_11000_Subscribe(self):
- myIdentifier = self.fcpClient.subscribeUSK('arbitrary')
- myRequest = self.fcpClient.getRequest(myIdentifier)
- requestsAll = self.fcpClient.getRequests()
+ myIdentifier = self.client.subscribeUSK('arbitrary')
+ myRequest = self.client.getRequest(myIdentifier)
+ requestsAll = self.client.getRequests()
self.failUnless(myIdentifier in requestsAll)
self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
@@ -2582,7 +2812,7 @@
)
msg = self.assertHasNextEvent(
- self.fcpClient.events.USKUpdated,
+ self.client.events.USKUpdated,
consts.Message.SubscribedUSKUpdate,
('Identifier', myIdentifier),
('Edition', 99),
@@ -2608,6 +2838,17 @@
Test_iterConnect,
Test_CloseConnectionDuplicateClientName,
Test_closeNode,
+ Test_get_setConnectionName,
+ Test_get_setDebugVerbosity,
+ Test_startNode,
+ Test_versionCheckNodeHello,
+ Test_handleMessage,
+ Test_next,
+ Test_run,
+ Test_sendMessage,
+ Test_getConfig,
+ Test_modifyConfig,
+
#TestDisconnectReason,
#TestClientGet,
#TestClientPut,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
