SF.net SVN: fclient:[944] trunk/fclient/fclient/impl/lib/fcp2/test/ test_client.py

[<jU...@us...>]

Revision: 944
          http://fclient.svn.sourceforge.net/fclient/?rev=944&view=rev
Author:   jUrner
Date:     2008-08-19 09:21:44 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
fix: request flag Started is set when a request is restored

Modified Paths:
--------------
    trunk/fclient/fclient/impl/lib/fcp2/test/test_client.py

Modified: trunk/fclient/fclient/impl/lib/fcp2/test/test_client.py
===================================================================
--- trunk/fclient/fclient/impl/lib/fcp2/test/test_client.py	2008-08-19 07:38:38 UTC (rev 943)
+++ trunk/fclient/fclient/impl/lib/fcp2/test/test_client.py	2008-08-19 09:21:44 UTC (rev 944)
@@ -1120,7 +1120,7 @@
 				self.client.events.RequestStarted,
 				fcp2.MsgClientGet,
 				('Identifier', myRequest['Identifier']),
-				('RequestStatus', fcp2.ConstRequestStatus.Restored),		# no RequestStatus.Pending flag should be set here
+				('RequestStatus', fcp2.ConstRequestStatus.Started | fcp2.ConstRequestStatus.Restored),		# no RequestStatus.Pending flag should be set here
 				)
 				
 				
@@ -1998,7 +1998,9 @@
 		self.assertHasNextMessage(fcp2.MsgRemoveRequest)
 		
 		# of our request should be marked as removed
-		self.assertEqual(myRequest['RequestStatus'], fcp2.ConstRequestStatus.Removed |
+		self.assertEqual(myRequest['RequestStatus'], 
+																				fcp2.ConstRequestStatus.Started |
+																				fcp2.ConstRequestStatus.Removed |
 																				fcp2.ConstRequestStatus.Completed
 																				)
 		
@@ -2014,7 +2016,9 @@
 		self.assertHasNextEvent(
 				self.client.events.RequestRemoved,
 				fcp2.MsgClientGet,
-				('RequestStatus', fcp2.ConstRequestStatus.Removed | 
+				('RequestStatus', 
+											fcp2.ConstRequestStatus.Started |
+											fcp2.ConstRequestStatus.Removed | 
 											fcp2.ConstRequestStatus.RemovedFromQueue |
 											fcp2.ConstRequestStatus.Completed
 											),
@@ -2099,7 +2103,7 @@
 				self.client.events.RequestStarted,
 				fcp2.MsgClientGet,
 				('Identifier', myRequest['Identifier']),
-				('RequestStatus', fcp2.ConstRequestStatus.Restored),		# no RequestStatus.Pending flag should be set here
+				('RequestStatus', fcp2.ConstRequestStatus.Started | fcp2.ConstRequestStatus.Restored),		# no RequestStatus.Pending flag should be set here
 				)
 		
 		self.failUnless(myRequest['Identifier'] in requestsAll) 


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