SF.net SVN: fclient: [332] trunk/sandbox/fcp2/test_fcp/test_client.py
Status: Pre-Alpha
Brought to you by:
jurner
Menu
▾
▴
SF.net SVN: fclient: [332] trunk/sandbox/fcp2/test_fcp/test_client.py
|
From: <jU...@us...> - 2008-03-07 09:54:16
|
Revision: 332
http://fclient.svn.sourceforge.net/fclient/?rev=332&view=rev
Author: jUrner
Date: 2008-03-07 01:54:21 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
adapt to Fc prefix has gone
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-07 09:54:15 UTC (rev 331)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py 2008-03-07 09:54:21 UTC (rev 332)
@@ -543,7 +543,7 @@
self.failUnless(myIdentifier in requestsAll)
self.assertEqual(myIdentifier, myRequest['Identifier'])
- self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Null)
+ self.assertEqual(myRequest['RequestStatus'], consts.RequestStatus.Null)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -613,20 +613,20 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
data=data
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
# cheat a bit to test peristence == Forever (client should not remove request)
requestsAll[myIdentifier] =myRequest
myRequest['Persistence'] = consts.Persistence.Forever
- myRequest['FcRequestStatus'] &= ~(consts.RequestStatus.Success |
+ myRequest['RequestStatus'] &= ~(consts.RequestStatus.Success |
consts.RequestStatus.Completed |
consts.RequestStatus.RemovedFromQueue
)
@@ -642,11 +642,11 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Success | consts.RequestStatus.Completed),
+ ('RequestStatus', consts.RequestStatus.Success | consts.RequestStatus.Completed),
data=data
)
self.failUnless(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -686,7 +686,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -700,7 +700,7 @@
requestsAll[myIdentifier] =myRequest
myRequest['Persistence'] = consts.Persistence.Forever
- myRequest['FcRequestStatus'] &= ~(consts.RequestStatus.Error |
+ myRequest['RequestStatus'] &= ~(consts.RequestStatus.Error |
consts.RequestStatus.Completed |
consts.RequestStatus.RemovedFromQueue
)
@@ -716,7 +716,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Error | consts.RequestStatus.Completed),
+ ('RequestStatus', consts.RequestStatus.Error | consts.RequestStatus.Completed),
)
self.failUnless(myIdentifier in requestsAll)
self.assertHasNextEvent(None)
@@ -760,13 +760,13 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -804,7 +804,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -849,13 +849,13 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -892,12 +892,12 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -934,12 +934,12 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -976,7 +976,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1008,7 +1008,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1039,7 +1039,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1070,7 +1070,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1101,7 +1101,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientPutDiskDir,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1132,7 +1132,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientPutDiskDir,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1163,7 +1163,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1194,7 +1194,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestFailed,
consts.Message.ClientPut,
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1210,22 +1210,22 @@
items = [
{
- 'FcRequestType': consts.RequestType.PutData,
+ 'RequestType': consts.RequestType.PutData,
'Data': '12345',
'Name': 'myItem0',
},
{
- 'FcRequestType': consts.RequestType.PutFile,
+ 'RequestType': consts.RequestType.PutFile,
'Filename': 'myFile.txt',
'Name': 'myItem1',
},
{
- 'FcRequestType': consts.RequestType.PutRedirect,
+ 'RequestType': consts.RequestType.PutRedirect,
'TargetURI': 'CHK@123456789',
'Name': 'myItem2',
},
{
- 'FcRequestType': consts.RequestType.PutData,
+ 'RequestType': consts.RequestType.PutData,
'Data': '67890',
'Name': 'myItem3',
},
@@ -1273,7 +1273,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestCompleted,
consts.Message.ClientPutComplexDir,
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1290,7 +1290,7 @@
# upload directory is not allowed
items = [
{
- 'FcRequestType': consts.RequestType.PutDir,
+ 'RequestType': consts.RequestType.PutDir,
'Data': '12345',
'Name': 'myItem0',
},
@@ -1303,7 +1303,7 @@
# no request type specified
items = [
{
- #'FcRequestType': consts.RequestType.PutData,
+ #'RequestType': consts.RequestType.PutData,
'Data': '12345',
'Name': 'myItem0',
},
@@ -1313,7 +1313,7 @@
# param missing (we enforce all required parameters)
items = [
{
- 'FcRequestType': consts.RequestType.PutData,
+ 'RequestType': consts.RequestType.PutData,
#'Data': '12345',
#'Name': 'myItem0',
},
@@ -1372,9 +1372,9 @@
)
self.assertHasNextEvent(self.fcpClient.events.RequestModified)
- self.failUnless(consts.RequestModified.PersistentUserData in myRequest['FcModified'])
- self.failUnless(consts.RequestModified.PriorityClass in myRequest['FcModified'])
- self.assertEqual('bar', myRequest['FcPersistentUserData'])
+ self.failUnless(consts.RequestModified.PersistentUserData in myRequest['Modified'])
+ self.failUnless(consts.RequestModified.PriorityClass in myRequest['Modified'])
+ self.assertEqual('bar', myRequest['PersistentUserData'])
self.assertEqual(consts.Priority.High, myRequest['PriorityClass'])
self.assertHasNextEvent(None)
@@ -1420,9 +1420,9 @@
self.assertHasNextEvent(self.fcpClient.events.RequestModified)
- self.failUnless(consts.RequestModified.PersistentUserData in myRequest['FcModified'])
- #self.failUnless(consts.RequestModified.PriorityClass in myRequest['FcModified'])
- self.assertEqual('bar', myRequest['FcPersistentUserData'])
+ self.failUnless(consts.RequestModified.PersistentUserData in myRequest['Modified'])
+ #self.failUnless(consts.RequestModified.PriorityClass in myRequest['Modified'])
+ self.assertEqual('bar', myRequest['PersistentUserData'])
#self.assertEqual(consts.Priority.High, myRequest['PriorityClass'])
self.assertHasNextEvent(None)
@@ -1458,7 +1458,7 @@
self.fcpClient.removeRequest(myIdentifier)
# of our request should be removed emidiately,
- self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Removed |
+ self.assertEqual(myRequest['RequestStatus'], consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
)
@@ -1468,7 +1468,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestRemoved,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Removed |
+ ('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1509,7 +1509,7 @@
# status of our request should be set to removed emidiately, but it should
# not be removed from the client
- self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Removed | consts.RequestStatus.Completed)
+ self.assertEqual(myRequest['RequestStatus'], consts.RequestStatus.Removed | consts.RequestStatus.Completed)
self.failUnless(myIdentifier in self.fcpClient.getRequests())
# client schould send a RemovePersistentRequest
@@ -1522,12 +1522,12 @@
)
# now the request should have been removed
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.RemovedFromQueue)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.RemovedFromQueue)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(
self.fcpClient.events.RequestRemoved,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Removed |
+ ('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1557,7 +1557,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestRemoved,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Removed |
+ ('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1599,7 +1599,7 @@
self.assertHasNextEvent(
self.fcpClient.events.RequestRemoved,
consts.Message.ClientGet,
- ('FcRequestStatus', consts.RequestStatus.Removed |
+ ('RequestStatus', consts.RequestStatus.Removed |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
@@ -1684,7 +1684,7 @@
self.fcpClient.events.RequestRestored,
consts.Message.ClientGet,
('Identifier', myIdentifier),
- ('FcRequestStatus', consts.RequestStatus.Restored), # no RequestStatus.Pending flag should be set here
+ ('RequestStatus', consts.RequestStatus.Restored), # no RequestStatus.Pending flag should be set here
)
self.failUnless(myIdentifier in requestsAll)
@@ -1832,8 +1832,8 @@
consts.Message.ClientGet,
)
- self.failUnless(consts.RequestModified.Identifier in msg['FcModified'])
- oldIdentifier = msg['FcModified'][consts.RequestModified.Identifier]
+ self.failUnless(consts.RequestModified.Identifier in msg['Modified'])
+ oldIdentifier = msg['Modified'][consts.RequestModified.Identifier]
newIdentifier = msg['Identifier']
self.assertEqual(oldIdentifier, myIdentifier)
self.assertNotEqual(newIdentifier, myIdentifier)
@@ -1880,12 +1880,12 @@
consts.Message.ClientGet
)
- self.failUnless(consts.RequestModified.Filename in msg['FcModified'])
- self.assertEqual(msg['FcModified'][consts.RequestModified.Filename], fpath)
+ self.failUnless(consts.RequestModified.Filename in msg['Modified'])
+ self.assertEqual(msg['Modified'][consts.RequestModified.Filename], fpath)
self.assertNotEqual(msg['Filename'], fpath)
# check flags
- filenameCollision = msg['FcFilenameCollision']
+ filenameCollision = msg['FilenameCollision']
self.assertEqual(
filenameCollision & consts.FilenameCollision.MaskHandle,
consts.FilenameCollision.HandleRename
@@ -1981,7 +1981,7 @@
Persistence=consts.Persistence.Connection,
)
self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
- msg['FcPrivateKey'] = myKey
+ msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
requestsAll = self.fcpClient.getRequests()
@@ -2004,7 +2004,7 @@
Persistence=consts.Persistence.Connection,
)
self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
- msg['FcPrivateKey'] = myKey
+ msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
requestsAll = self.fcpClient.getRequests()
@@ -2026,7 +2026,7 @@
Persistence=consts.Persistence.Connection,
)
self.fcpClient._registerRequest(msg, consts.RequestType.PutData)
- msg['FcPrivateKey'] = myKey
+ msg['PrivateKey'] = myKey
myIdentifier = msg['Identifier']
requestsAll = self.fcpClient.getRequests()
@@ -2087,14 +2087,14 @@
consts.Message.GetPluginInfo,
('Identifier', myIdentifier),
('PluginName', 'hi there'),
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2126,14 +2126,14 @@
consts.Message.GetPluginInfo,
#('PluginName', 'hi there'),
('Identifier', myIdentifier),
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2167,16 +2167,16 @@
consts.Message.FCPPluginMessage,
('PluginName', 'hi there'),
('Identifier', myIdentifier),
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
- reply = msg['FcPluginReply']
+ reply = msg['PluginReply']
self.failUnless(reply.params.get('baz', None) == '12345')
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2208,14 +2208,14 @@
consts.Message.FCPPluginMessage,
#('PluginName', 'hi there'),
('Identifier', myIdentifier),
- ('FcRequestStatus', consts.RequestStatus.Error |
+ ('RequestStatus', consts.RequestStatus.Error |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2247,15 +2247,15 @@
self.fcpClient.events.KeypairGenerated,
consts.Message.GenerateSSK,
('Identifier', myIdentifier),
- ('FcPublicKey','SSK@public'),
- ('FcPrivateKey','SSK@private'),
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('PublicKey','SSK@public'),
+ ('PrivateKey','SSK@private'),
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2279,15 +2279,15 @@
self.fcpClient.events.KeypairGenerated,
consts.Message.GenerateSSK,
('Identifier', myIdentifier),
- ('FcPublicKey','USK@public'),
- ('FcPrivateKey','USK@private'),
- ('FcRequestStatus', consts.RequestStatus.Success |
+ ('PublicKey','USK@public'),
+ ('PrivateKey','USK@private'),
+ ('RequestStatus', consts.RequestStatus.Success |
consts.RequestStatus.RemovedFromQueue |
consts.RequestStatus.Completed
),
)
self.failIf(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextEvent(None)
self.assertHasNextMessage(None)
@@ -2307,7 +2307,7 @@
requestsAll = self.fcpClient.getRequests()
self.failUnless(myIdentifier in requestsAll)
- self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
+ self.failUnless(myRequest['RequestStatus'] & consts.RequestStatus.Completed)
self.assertHasNextMessage(consts.Message.SubscribeUSK)
self.sendResponseMessage(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
