SF.net SVN: fclient: [238] trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py

[<ju...@us...>]

Revision: 238
          http://fclient.svn.sourceforge.net/fclient/?rev=238&view=rev
Author:   jurner
Date:     2008-02-21 05:11:07 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
RequestStatus.Completed flag is now set before listeners are informed

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-21 13:10:08 UTC (rev 237)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-21 13:11:07 UTC (rev 238)
@@ -621,7 +621,8 @@
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
 				('FcRequestStatus', 	consts.RequestStatus.Success | 
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				data=data
 				)
@@ -648,7 +649,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Success),
+				('FcRequestStatus', consts.RequestStatus.Success | consts.RequestStatus.Completed),
 				data=data
 				)
 		self.failUnless(myIdentifier in requestsAll)
@@ -693,10 +694,10 @@
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Error | 
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
-		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
 		
@@ -722,10 +723,9 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcRequestStatus', consts.RequestStatus.Error),
+				('FcRequestStatus', consts.RequestStatus.Error | consts.RequestStatus.Completed),
 				)
 		self.failUnless(myIdentifier in requestsAll)
-		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
 		
@@ -768,7 +768,8 @@
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Success | 
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 		self.failIf(myIdentifier in requestsAll)
@@ -806,15 +807,17 @@
 				Global='false',
 				# blah.. more here
 				)
+		
+		print consts.RequestStatus.humanReadable(myRequest['FcRequestStatus'])
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Error | 
-												consts.RequestStatus.RemovedFromQueue
+												consts.RequestStatus.RemovedFromQueue |
+												consts.RequestStatus.Completed
 												),
 				)
 		self.failIf(myIdentifier in requestsAll)
-		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		self.assertHasNextMessage(None)
 		
@@ -855,7 +858,8 @@
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Success |
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 		self.failIf(myIdentifier in requestsAll)
@@ -897,7 +901,8 @@
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Success |
-												consts.RequestStatus.RemovedFromQueue
+												consts.RequestStatus.RemovedFromQueue |
+												consts.RequestStatus.Completed
 												),
 				)
 		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
@@ -938,7 +943,8 @@
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Error | 
-												consts.RequestStatus.RemovedFromQueue
+												consts.RequestStatus.RemovedFromQueue |
+												consts.RequestStatus.Completed
 												),
 				)
 		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
@@ -1079,8 +1085,8 @@
 		
 		# of our request should be removed emidiately,
 		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Removed |
-																				consts.RequestStatus.Completed |
-																				consts.RequestStatus.RemovedFromQueue
+																				consts.RequestStatus.RemovedFromQueue |
+																				consts.RequestStatus.Completed
 																				)
 		self.failIf(myIdentifier in self.fcpClient.getRequests())
 				
@@ -1089,7 +1095,8 @@
 				self.fcpClient.events.RequestRemoved,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Removed | 
-											consts.RequestStatus.RemovedFromQueue
+											consts.RequestStatus.RemovedFromQueue |
+											consts.RequestStatus.Completed
 											),
 				)
 		self.failIf(self.fcpClient.getRequests())
@@ -1147,7 +1154,8 @@
 				self.fcpClient.events.RequestRemoved,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Removed | 
-										consts.RequestStatus.RemovedFromQueue
+										consts.RequestStatus.RemovedFromQueue |
+										consts.RequestStatus.Completed
 										),
 				)
 		
@@ -1176,7 +1184,8 @@
 				self.fcpClient.events.RequestRemoved,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Removed | 
-										consts.RequestStatus.RemovedFromQueue
+										consts.RequestStatus.RemovedFromQueue |
+										consts.RequestStatus.Completed
 										),
 				)
 				
@@ -1217,7 +1226,8 @@
 				self.fcpClient.events.RequestRemoved,
 				consts.Message.ClientGet,
 				('FcRequestStatus', consts.RequestStatus.Removed | 
-										consts.RequestStatus.RemovedFromQueue
+										consts.RequestStatus.RemovedFromQueue |
+										consts.RequestStatus.Completed
 										),
 				)
 		
@@ -1594,7 +1604,8 @@
 				('Identifier', myIdentifier),
 				('PluginName', 'hi there'),
 				('FcRequestStatus', consts.RequestStatus.Success |
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 		
@@ -1632,7 +1643,8 @@
 				#('PluginName', 'hi there'),
 				('Identifier', myIdentifier),
 				('FcRequestStatus', consts.RequestStatus.Error |
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 				
@@ -1672,7 +1684,8 @@
 				('PluginName', 'hi there'),
 				('Identifier', myIdentifier),
 				('FcRequestStatus', consts.RequestStatus.Success |
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 		reply = msg['FcPluginReply']
@@ -1712,7 +1725,8 @@
 				#('PluginName', 'hi there'),
 				('Identifier', myIdentifier),
 				('FcRequestStatus', consts.RequestStatus.Error |
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 				
@@ -1752,7 +1766,8 @@
 				('FcPublicKey','SSK@public'),
 				('FcPrivateKey','SSK@private'), 
 				('FcRequestStatus', consts.RequestStatus.Success | 
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed
 													),
 				)
 		self.failIf(myIdentifier in requestsAll)
@@ -1783,7 +1798,8 @@
 				('FcPublicKey','USK@public'),
 				('FcPrivateKey','USK@private'), 
 				('FcRequestStatus', consts.RequestStatus.Success | 
-													consts.RequestStatus.RemovedFromQueue
+													consts.RequestStatus.RemovedFromQueue |
+													consts.RequestStatus.Completed													
 													),
 				)
 		self.failIf(myIdentifier in requestsAll)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.