Rev 3142: Review feeback. in file:///v/home/vila/src/bzr/bugs/175524/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/175524/

------------------------------------------------------------
revno: 3142
revision-id:v.ladeuil+lp at free.fr-20080103084412-5bjr40bt0hbqorbk
parent: v.ladeuil+lp at free.fr-20071228165130-iv5p12lfc2fmbb7u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 175524
timestamp: Thu 2008-01-03 09:44:12 +0100
message:
  Review feeback.
  
  * bzrlib/tests/test_http.py:
  (TestSpecificRequestHandler): Typo in doc string.
  
  * bzrlib/tests/http_server.py:
  (TestingHTTPServerMixin.tearDown): Mentioned by Aaron for win32.
modified:
  bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2007-12-28 16:51:30 +0000
+++ b/bzrlib/tests/http_server.py	2008-01-03 08:44:12 +0000
@@ -344,7 +344,14 @@
          # that since the server is in a blocking operation and since python
          # use select internally, shutting down the socket is reliable and
          # relatively clean.
-         self.socket.shutdown(socket.SHUT_RDWR)
+         try:
+             self.socket.shutdown(socket.SHUT_RDWR)
+         except socket.error, e:
+             # WSAENOTCONN (10057) 'Socket is not connected' is harmless on
+             # windows (occurs before the first connection attempt
+             # vila--20071230)
+             if not len(e.args) or e.args[0] != 10057:
+                 raise
          # Let the server properly close the socket
          self.server_close()
 

=== modified file 'bzrlib/tests/test_http.py'
--- a/bzrlib/tests/test_http.py	2007-12-28 16:51:30 +0000
+++ b/bzrlib/tests/test_http.py	2008-01-03 08:44:12 +0000
@@ -529,8 +529,7 @@
 class TestSpecificRequestHandler(http_utils.TestCaseWithWebserver):
     """Tests a specific request handler.
 
-
-    Daughter class are expected to override _req_handler_class
+    Daughter classes are expected to override _req_handler_class
     """
 
     # Provide a useful default