SF.net SVN: fclient:[722] trunk/fclient/src/fclient/lib/fcp2
Status: Pre-Alpha
Brought to you by:
jurner
|
From: <jU...@us...> - 2008-07-25 07:08:07
|
Revision: 722
http://fclient.svn.sourceforge.net/fclient/?rev=722&view=rev
Author: jUrner
Date: 2008-07-25 07:08:16 +0000 (Fri, 25 Jul 2008)
Log Message:
-----------
RequestRestored has gone. use RequestStarted
Modified Paths:
--------------
trunk/fclient/src/fclient/lib/fcp2/client.py
trunk/fclient/src/fclient/lib/fcp2/test/test_client.py
Modified: trunk/fclient/src/fclient/lib/fcp2/client.py
===================================================================
--- trunk/fclient/src/fclient/lib/fcp2/client.py 2008-07-25 07:07:59 UTC (rev 721)
+++ trunk/fclient/src/fclient/lib/fcp2/client.py 2008-07-25 07:08:16 UTC (rev 722)
@@ -905,11 +905,9 @@
if 'Started' in initialRequest.params:
del initialRequest.params['Started']
initialRequest['RequestStatus'] |= consts.ConstRequestStatus.Restored
- self.events.RequestRestored(initialRequest)
- return True
-
- #TODO: ignore handshake?
- return False
+
+ self.events.RequestStarted(initialRequest)
+ return True
elif msg == message.MsgPersistentRequestModified:
@@ -1395,7 +1393,7 @@
IgnoreDS=ignoreDS,
Persistence=persistence,
PriorityClass=priorityClass,
- ReturnType=consts.ConstReturnType.Direct,
+ ReturnType=consts.ConstReturnType.Disk,
Verbosity=consts.ConstVerbosity.ReportProgress,
)
if allowedMimeTypes is not None: msg['AllowedMimeTypes'] = allowedMimeTypes
Modified: trunk/fclient/src/fclient/lib/fcp2/test/test_client.py
===================================================================
--- trunk/fclient/src/fclient/lib/fcp2/test/test_client.py 2008-07-25 07:07:59 UTC (rev 721)
+++ trunk/fclient/src/fclient/lib/fcp2/test/test_client.py 2008-07-25 07:08:16 UTC (rev 722)
@@ -1120,7 +1120,7 @@
self.failUnless(myIdentifier in requestsAll)
myRequest = self.client.getRequest(myIdentifier)
msg = self.assertHasNextEvent(
- self.client.events.RequestRestored,
+ self.client.events.RequestStarted,
fcp2.MsgClientGet,
('Identifier', myIdentifier),
('RequestStatus', fcp2.ConstRequestStatus.Restored), # no RequestStatus.Pending flag should be set here
@@ -1222,7 +1222,7 @@
self.failUnless(myIdentifier in requestsAll)
- self.assertHasNextEvent(None)
+ self.assertHasNextEvent(self.client.events.RequestStarted)
self.assertHasNextMessage(None)
self.failUnless(self.ioOpen())
@@ -1915,7 +1915,7 @@
Started='false',
**myRequest.params
)
- #self.assertNextMessage(fcp2.MsgClientGet)
+ self.assertHasNextEvent(self.client.events.RequestStarted)
# test modify persistent user data
@@ -1963,6 +1963,7 @@
Started='false',
**myRequest.params
)
+ self.assertHasNextEvent(self.client.events.RequestStarted)
# test modify persistent user data
self.client.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=fcp2.ConstPriority.High)
@@ -2122,7 +2123,7 @@
# check if the client restored the request
msg = self.assertHasNextEvent(
- self.client.events.RequestRestored,
+ self.client.events.RequestStarted,
fcp2.MsgClientGet,
('Identifier', myIdentifier),
('RequestStatus', fcp2.ConstRequestStatus.Restored), # no RequestStatus.Pending flag should be set here
@@ -2217,7 +2218,7 @@
)
self.assertEqual(len(requestsAll), 1)
- self.assertHasNextEvent(None)
+ self.assertHasNextEvent(self.client.events.RequestStarted)
self.assertHasNextMessage(None)
@@ -2371,7 +2372,7 @@
)
self.assertEqual(len(requestsAll), 1)
- self.assertHasNextEvent(None)
+ self.assertHasNextEvent(self.client.events.RequestStarted)
self.assertHasNextMessage(None)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|