SF.net SVN: fclient: [382] trunk/sandbox/fcp2/test_fcp/test_client.py

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

Revision: 382
          http://fclient.svn.sourceforge.net/fclient/?rev=382&view=rev
Author:   jUrner
Date:     2008-04-09 00:32:18 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
moved errors and loggers to consts for easier access

Modified Paths:
--------------
    trunk/sandbox/fcp2/test_fcp/test_client.py

Modified: trunk/sandbox/fcp2/test_fcp/test_client.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_client.py	2008-04-09 07:32:04 UTC (rev 381)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py	2008-04-09 07:32:18 UTC (rev 382)
@@ -281,7 +281,7 @@
 			self.client.ioHandler.io.setReverseDirection(True)
 			try:
 				msg = self.client.ioHandler.readMessage()
-			except self.client.ioHandler.IOTimeout:
+			except consts.IOTimeoutError:
 				return None
 			finally:
 				self.client.ioHandler.io.setReverseDirection(False)
@@ -426,7 +426,7 @@
 				enum.next()
 			except StopIteration:
 				break
-			except self.client.ioHandler.IOBroken, d:
+			except consts.IOBrokenError, d:
 				errorRaised = True
 				self.assertHasNextEvent(
 					self.client.events.ClientDisconnected,
@@ -731,7 +731,7 @@
 		self.connectClient()
 		self.getIO().setBroken(True)
 			
-		self.assertRaises(self.client.ioHandler.IOBroken, self.client.next, )
+		self.assertRaises(consts.IOBrokenError, self.client.next, )
 		self.assertHasNextEvent(
 			self.client.events.ClientDisconnected,
 			consts.Message.ClientDisconnected,
@@ -773,7 +773,7 @@
 		self.connectClient()
 		self.getIO().setBroken(True)
 			
-		self.assertRaises(self.client.ioHandler.IOBroken, self.client.sendMessage, self.client.message.ClientHello())
+		self.assertRaises(consts.IOBrokenError, self.client.sendMessage, self.client.message.ClientHello())
 		self.assertHasNextEvent(
 			self.client.events.ClientDisconnected,
 			consts.Message.ClientDisconnected,
@@ -1089,7 +1089,7 @@
 				
 				callNext=False
 				)
-		self.assertRaises(self.client.ioHandler.MessageParseError, self.client.next)
+		self.assertRaises(consts.MessageParseError, self.client.next)
 		self.failIf(myIdentifier in requestsAll)
 		
 		


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