[Python-checkins] r54255 - in python/branches/release25-maint: Lib/SocketServer.py Lib/test/test_socketserver.py Misc/NEWS

[Collin Winter]

On 3/9/07, Neal Norwitz <nnorwitz at gmail.com> wrote:
> On 3/9/07, collin.winter <python-checkins at python.org> wrote:
> >
> > Modified: python/branches/release25-maint/Lib/test/test_socketserver.py
> > ==============================================================================
> > --- python/branches/release25-maint/Lib/test/test_socketserver.py       (original)
> > +++ python/branches/release25-maint/Lib/test/test_socketserver.py       Sat Mar 10 04:31:44 2007
> > @@ -84,6 +84,7 @@
> >          addr = getattr(svr, 'server_address')
> >          if addr:
> >              self.__addr = addr
> > +            assert self.__addr == svr.socket.getsockname()
> >          if verbose: print "thread: serving three times"
> >          svr.serve_a_few()
> >          if verbose: print "thread: done"
>
> It would be better to do something like:
>
>   if self.__addr != svr.socket.getsockname():
>     raise RuntimeError, 'getsockname returns %s, expected %s' %
> (svr.socket.getsockname(), self.__addr)
>
> That way when running the tests with -O, errors won't pass silently.

I think the error message is more like

raise RuntimeError('server_address was %s, expected %s' %
                                       (self.__addr, svr.socket.getsockname()))

but I take your point. I'll make the changes.

Collin Winter