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

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

Revision: 158
          http://fclient.svn.sourceforge.net/fclient/?rev=158&view=rev
Author:   jurner
Date:     2008-02-06 02:54:27 -0800 (Wed, 06 Feb 2008)

Log Message:
-----------
more fine grained status and type flags for requests

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-06 10:54:05 UTC (rev 157)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-06 10:54:27 UTC (rev 158)
@@ -2,6 +2,7 @@
 from __future__ import with_statement
 
 import os, sys
+import copy
 import socket
 import tempfile
 import time
@@ -60,6 +61,8 @@
 		self.messages.append(self.fcpClient.Message.fromSocket(s))
 	
 	def _captureEventsFromClient(self, event, msg):
+		# have to copy message here, to get exact state
+		msg = copy.deepcopy(msg)
 		self.events.append( (event, msg) )
 		
 	def connectClient(self):
@@ -536,17 +539,24 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Removed),
+				('FcStatus', consts.RequestStatus.Pending | 
+										consts.RequestStatus.Started | 
+										consts.RequestStatus.Success | 
+										consts.RequestStatus.Removed),
 				data=data
 				)
 		self.failIf(myIdentifier in allRequests)
+		self.failUnless(myRequest['FcStatus'] & 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.Complete | consts.RequestStatus.Removed) 
+		myRequest['FcStatus'] &= ~(consts.RequestStatus.Success | 
+															consts.RequestStatus.Removed | 
+															consts.RequestStatus.Completed 
+															) 
 		self.sendResponseMessage(
 				'AllData',
 				data=data,
@@ -559,16 +569,16 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete),
+				('FcStatus', consts.RequestStatus.Pending | 
+										consts.RequestStatus.Started | 
+										consts.RequestStatus.Success),
 				data=data
 				)
 		self.failUnless(myIdentifier in allRequests)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		
-		
-	
-	
 	def testGetData_Failure(self):
 						
 		# request a arbitrary file
@@ -604,8 +614,12 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
+				('FcStatus', consts.RequestStatus.Pending | 
+										consts.RequestStatus.Started | 
+										consts.RequestStatus.Error | 
+										consts.RequestStatus.Removed)
 				)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		#return
@@ -614,7 +628,9 @@
 		
 		allRequests[myIdentifier] =myRequest
 		myRequest['Persistence'] = consts.Persistence.Forever
-		myRequest['FcStatus'] &= ~(consts.RequestStatus.Error | consts.RequestStatus.Removed)
+		myRequest['FcStatus'] &= ~(consts.RequestStatus.Error | 
+															consts.RequestStatus.Removed | 
+															consts.RequestStatus.Completed)
 		self.sendResponseMessage(
 				'GetFailed',
 				Code='28',		# All data not found
@@ -627,9 +643,13 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error),
+				('FcStatus', consts.RequestStatus.Pending | 
+										consts.RequestStatus.Started | 
+										consts.RequestStatus.Error
+										),
 				)
 		self.failUnless(myIdentifier in allRequests)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 	
 	
@@ -673,9 +693,10 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Removed)
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Success | consts.RequestStatus.Removed)
 				)
 		self.failIf(myIdentifier in allRequests)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 
 
@@ -718,10 +739,10 @@
 				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
 				)
 		self.failIf(myIdentifier in allRequests)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
+		
 	
-	
-	
 	def testGetKeyInfo_Success(self):
 		
 		# request a arbitrary uri
@@ -762,13 +783,14 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete)
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Success)
 				)
 		self.failIf(myIdentifier not in allRequests)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		# test specdial case where ProtocolError.TooBig is handled as success
-		myRequest['FcStatus'] &= ~(consts.RequestStatus.Complete)
+		myRequest['FcStatus'] &= ~(consts.RequestStatus.Success)
 		self.sendResponseMessage(
 				'GetFailed',
 				Code='21',		# Too big
@@ -779,8 +801,13 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestCompleted,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete)
+				('FcStatus', consts.RequestStatus.Pending | 
+										consts.RequestStatus.Started | 
+										consts.RequestStatus.Success | 
+										consts.RequestStatus.Completed
+										)
 				)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 		
 		# cheat a bit to test persistence == Connection
@@ -826,6 +853,7 @@
 				consts.Message.ClientGet,
 				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
 				)
+		self.failUnless(myRequest['FcStatus'] & consts.RequestStatus.Completed)
 		self.assertHasNextEvent(None)
 
 #***********************************************************************************


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