From: Collin Winter <collinw@gmail.com>
Date: Sat, 10 Mar 2007 14:35:22 +0000 (+0000)
Subject: Convert an assert to a raise so it works even in the presence of -O.
X-Git-Tag: v2.5.1c1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69fe9e478f5fac59b9a8bca5a317d9212c790e96;p=python

Convert an assert to a raise so it works even in the presence of -O.
---

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 6232175706..9a67a358b7 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -81,10 +81,12 @@ class ServerThread(threading.Thread):
         svr = svrcls(self.__addr, self.__hdlrcls)
         # pull the address out of the server in case it changed
         # this can happen if another process is using the port
-        addr = getattr(svr, 'server_address')
+        addr = svr.server_address
         if addr:
             self.__addr = addr
-            assert self.__addr == svr.socket.getsockname()
+            if self.__addr != svr.socket.getsockname():
+                raise RuntimeError('server_address was %s, expected %s' %
+                                       (self.__addr, svr.socket.getsockname()))
         if verbose: print "thread: serving three times"
         svr.serve_a_few()
         if verbose: print "thread: done"