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

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

Revision: 154
          http://fclient.svn.sourceforge.net/fclient/?rev=154&view=rev
Author:   jurner
Date:     2008-02-05 08:00:15 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
adapt to request status flag changes

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-05 15:59:49 UTC (rev 153)
+++ trunk/sandbox/fcp/test_fcp/test_fcp2_0_client.py	2008-02-05 16:00:15 UTC (rev 154)
@@ -604,7 +604,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
 				)
 		self.assertHasNextEvent(None)
 		
@@ -627,7 +627,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Error),
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error),
 				)
 		self.failUnless(myIdentifier in allRequests)
 		self.assertHasNextEvent(None)
@@ -715,7 +715,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
 				)
 		self.failIf(myIdentifier in allRequests)
 		self.assertHasNextEvent(None)
@@ -824,7 +824,7 @@
 		self.assertHasNextEvent(
 				self.fcpClient.events.RequestFailed,
 				consts.Message.ClientGet,
-				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Complete | consts.RequestStatus.Error | consts.RequestStatus.Removed)
+				('FcStatus', consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Error | consts.RequestStatus.Removed)
 				)
 		self.assertHasNextEvent(None)
 
@@ -906,7 +906,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.Removed)
+		self.assertEqual(myRequest['FcStatus'], consts.RequestStatus.Pending | consts.RequestStatus.Started | consts.RequestStatus.Removed)
 		self.failUnless(myIdentifier in self.fcpClient.getRequests())
 		
 		# client schould send a RemovePersistentRequest


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