SF.net SVN: fclient: [148] trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient: [148] trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py
|
From: <ju...@us...> - 2008-02-05 12:27:51
|
Revision: 148
http://fclient.svn.sourceforge.net/fclient/?rev=148&view=rev
Author: jurner
Date: 2008-02-05 04:27:53 -0800 (Tue, 05 Feb 2008)
Log Message:
-----------
adapt
Modified Paths:
--------------
trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py
Modified: trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py 2008-02-05 12:27:18 UTC (rev 147)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py 2008-02-05 12:27:53 UTC (rev 148)
@@ -64,7 +64,7 @@
def connectClient(self):
"""Connects to the client"""
- enum = self.fcpClient.connect(duration=0.2, timeout=0.1)
+ enum = self.fcpClient.iterConnect(duration=0.2, timeout=0.1)
msg = enum.next()
self.failIf(msg is not None)
#NOTE: have to send directly via socket here (our sendResponseMessage
@@ -198,8 +198,7 @@
# conect all events
self.events = [] # events received from the client
- for eventName in self.fcpClient.Events._events_:
- event = getattr(self.fcpClient.events, eventName)
+ for event in self.fcpClient.events:
event += self._captureEventsFromClient
# capture all messages the client sent
@@ -210,8 +209,7 @@
fcp2_0_client.socket = self.oldSocketModule
# disconnect all events
- for eventName in self.fcpClient.Events._events_:
- event = getattr(self.fcpClient.events, eventName)
+ for event in self.fcpClient.events:
event -= self._captureEventsFromClient
# clean up tmpfiles
for fpath in self.tmpfiles: os.remove(fpath)
@@ -245,8 +243,30 @@
self.failUnless(self.socket.closed)
- def testConnect_Failure(self):
+
+ def testConnect(self):
+ nodeHello = self.fcpClient.connect(duration=0.2, timeout=0.1)
+ self.failIf(nodeHello is not None)
+ self.socket.sendResponseMessage(
+ 'NodeHello',
+ FCPVersion='2.0',
+ Node='Fred',
+ Version=str(self.fcpClient.ExpectedFcpVersion),
+ Revision='999999999999',
+ Build='9999999999',
+ ExRevision='9999999999',
+ Testnet='false',
+ CompressionCodecs='1',
+ ConnectionIdentifier='any',
+ NodeLanguage='en',
+ )
+ nodeHello = self.fcpClient.connect(duration=0.2, timeout=0.1)
+ self.failIf(nodeHello is None)
+
+
+ def testIterConnect_Failure(self):
+
# simulate a failed connection attempt
enum = self.fcpClient.connect(duration=0.2, timeout=0.1)
t0 = time.time()
@@ -274,10 +294,10 @@
self.failUnless(self.socket.closed)
- def testConnect_Success(self):
+ def testIterConnect_Success(self):
# simulate a successful connection attempt
- enum = self.fcpClient.connect(duration=0.2, timeout=0.1)
+ enum = self.fcpClient.iterConnect(duration=0.2, timeout=0.1)
msg = enum.next()
self.failIf(msg is not None)
@@ -394,7 +414,7 @@
def testVersionMismatch(self):
# cheat a bit and reconnect client
- enum = self.fcpClient.connect(duration=0.2, timeout=0.1)
+ enum = self.fcpClient.iterConnect(duration=0.2, timeout=0.1)
msg = enum.next()
self.failIf(msg is not None)
@@ -449,7 +469,7 @@
self.failUnless(self.fcpClient.getRequests() )
myRequest = self.fcpClient.getRequest(myIdentifier)
self.assertEqual(myIdentifier, myRequest['Identifier'])
- self.assertEqual(myRequest['FcStatus'], consts.MessageStatus.Pending)
+ self.assertEqual(myRequest['FcStatus'], consts.RequestStatus.Pending)
def testGetData_Success(self):
@@ -469,7 +489,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -513,7 +533,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Complete),
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Removed),
data=data
)
self.assertHasNextEvent(None)
@@ -536,7 +556,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -551,7 +571,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Error)
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
)
self.assertHasNextEvent(None)
@@ -575,7 +595,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -594,7 +614,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Complete)
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Removed)
)
self.assertHasNextEvent(None)
@@ -618,7 +638,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -633,7 +653,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Error)
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
)
self.assertHasNextEvent(None)
@@ -658,7 +678,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -677,7 +697,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Complete)
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Removed)
)
self.assertHasNextEvent(None)
@@ -692,7 +712,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Complete)
+ ('FcStatus', consts.RequestStatus.Complete)
)
self.assertHasNextEvent(None)
@@ -715,7 +735,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestStarted,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Started)
+ ('FcStatus', consts.RequestStatus.Started)
)
self.assertHasNextEvent(None)
@@ -730,7 +750,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcStatus', consts.MessageStatus.Error)
+ ('FcStatus', consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
)
self.assertHasNextEvent(None)
@@ -812,7 +832,7 @@
# status of our request should be set to removed emidiately, but it should
# not be removed from the client
- self.assertEqual(myRequest['FcStatus'], consts.MessageStatus.Removed)
+ self.assertEqual(myRequest['FcStatus'], consts.RequestStatus.Removed)
self.failUnless(myIdentifier in self.fcpClient.getRequests())
# client schould send a RemovePersistentRequest
@@ -873,7 +893,7 @@
)
myRequest = self.fcpClient.getRequest(myIdentifier)
identifier = myRequest['Identifier']
-
+
self.fcpClient.removeRequest(myIdentifier)
self.sendResponseMessage(
'PersistentRequestRemoved',
@@ -895,7 +915,7 @@
)
# check if the client restored the request
- self.assertHasNextEvent(
+ msg = self.assertHasNextEvent(
self.fcpClient.events.RequestRestored,
consts.Message.ClientGet,
('Identifier', myIdentifier)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
