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

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

Revision: 175
          http://fclient.svn.sourceforge.net/fclient/?rev=175&view=rev
Author:   jurner
Date:     2008-02-08 00:38:28 -0800 (Fri, 08 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-08 08:37:46 UTC (rev 174)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-08 08:38:28 UTC (rev 175)
@@ -472,7 +472,7 @@
 		self.failUnless(self.fcpClient.getRequests() )
 		myRequest = self.fcpClient.getRequest(myIdentifier)
 		self.assertEqual(myIdentifier, myRequest['Identifier'])
-		self.assertEqual(myRequest['FcStatus'], consts.RequestStatus.Pending)
+		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Pending)
 		
 	
 	def testGetData_Success(self):
@@ -490,13 +490,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-			
+					
 		# simulate a progress
 		self.sendResponseMessage(
 				'SimpleProgress',
@@ -539,22 +533,21 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Success | 
 										consts.RequestStatus.RemovedFromQueue
 										),
 				data=data
 				)
 		self.failIf(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 	
 		# cheat a bit to test peristence == Forever (client should not remove request)
 		allRequests[myIdentifier] =myRequest
 		myRequest['Persistence'] = consts.Persistence.Forever
-		myRequest['FcStatus'] &= ~(consts.RequestStatus.Success | 
+		myRequest['FcRequestStatus'] &= ~(consts.RequestStatus.Success | 
 															consts.RequestStatus.Completed |
 															consts.RequestStatus.RemovedFromQueue
 															) 
@@ -570,13 +563,12 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Success),
 				data=data
 				)
 		self.failUnless(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		
@@ -595,13 +587,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-			
+					
 		# finalize request
 		self.sendResponseMessage(
 				'GetFailed',
@@ -615,13 +601,12 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		#return
@@ -630,7 +615,7 @@
 		
 		allRequests[myIdentifier] =myRequest
 		myRequest['Persistence'] = consts.Persistence.Forever
-		myRequest['FcStatus'] &= ~(consts.RequestStatus.Error | 
+		myRequest['FcRequestStatus'] &= ~(consts.RequestStatus.Error | 
 															consts.RequestStatus.Completed |
 															consts.RequestStatus.RemovedFromQueue
 															)
@@ -646,13 +631,12 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Error
 										),
 				)
 		self.failUnless(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 	
 	
@@ -674,13 +658,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-				
+						
 		# finalize request
 		data = 'foo'
 		params = {
@@ -696,14 +674,13 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Success | 
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
 		self.failIf(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 
 
@@ -725,13 +702,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-				
+						
 		# finalize request
 		self.sendResponseMessage(
 				'GetFailed',
@@ -743,14 +714,13 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
 		self.failIf(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 	
@@ -771,13 +741,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-				
+						
 		# finalize request
 		data = 'foo'
 		params = {
@@ -793,14 +757,13 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Success |
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
 		self.failIf(myIdentifier in allRequests)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		
@@ -822,13 +785,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-		
+				
 		# finalize request
 		self.sendResponseMessage(
 				'GetFailed',
@@ -840,19 +797,15 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Success |
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
-		# cheat a bit to test persistence == Connection
-		myRequest['Persistence'] = consts.Persistence.Connection
-		myRequest['FcStatus'] = consts.RequestStatus.Started
-	
+					
 			
 	def testGetKeyInfo_Failure(self):
 						
@@ -869,13 +822,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started)
-				)
-		self.assertHasNextEvent(None)
-				
+						
 		# finalize request
 		self.sendResponseMessage(
 				'GetFailed',
@@ -887,13 +834,12 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | 
-										consts.RequestStatus.Started | 
+				('FcRequestStatus', consts.RequestStatus.Pending | 
 										consts.RequestStatus.Error | 
 										consts.RequestStatus.RemovedFromQueue
 										)
 				)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 
 #***********************************************************************************
@@ -928,8 +874,7 @@
 				Started='false',
 				**myRequest.params
 				)
-		self.assertHasNextEvent(self.fcpClient.events.RequestStarted	)
-				
+						
 		# test modify persistent user data
 		self.fcpClient.modifyRequest(myIdentifier, persistentUserData='bar', priorityClass=consts.Priority.High)
 		msg = self.assertHasNextMessage(consts.Message.ModifyPersistentRequest)
@@ -974,8 +919,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.RequestStatus.Pending | 
-																				consts.RequestStatus.Started | 
+		self.assertEqual(myRequest['FcRequestStatus'], consts.RequestStatus.Pending | 
 																				consts.RequestStatus.Removed
 																				)
 		self.failUnless(myIdentifier in self.fcpClient.getRequests())
@@ -990,8 +934,8 @@
 				)
 			
 		# now the request should have been removed
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.RemovedFromQueue)
-		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.RemovedFromQueue)
+		self.failUnless(myRequest['FcRequestStatus'] & consts.RequestStatus.Completed)
 		self.failIf(self.fcpClient.getRequests())
 		self.assertHasNextEvent(None)
 
@@ -1064,7 +1008,7 @@
 				self.fcpClient.events.RequestRestored,
 				consts.Message.ClientGet,
 				('Identifier', myIdentifier),
-				('FcStatus', consts.RequestStatus.Started),		# no RequestStatus.Pending flag should be set here
+				('FcRequestStatus', consts.RequestStatus.Null),		# no RequestStatus.Pending flag should be set here
 				)
 		
 		self.failUnless(myIdentifier in allRequests) 
@@ -1158,14 +1102,6 @@
 				**msg.params
 				)
 				
-		# check if client send expected events
-		self.assertHasNextEvent(
-				self.fcpClient.events.RequestStarted,
-				consts.Message.ClientGet,
-				('Identifier', myIdentifier)
-				)
-		self.assertHasNextEvent(None)
-		
 		requests = self.fcpClient.getRequests()
 		self.assertEqual(len(requests), 1)
 


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