[MERGE] Misc fixes for win32

Aaron Bentley aaron at aaronbentley.com
Sun Dec 30 17:21:07 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
>>>>>> "aaron" == Aaron Bentley <aaron at aaronbentley.com> writes:
> 
> <snip/>
> 
>     aaron> Unfortunately, the HTTP tests are a real mess.
> 
> So nice to say ;-)

Well, I wasn't trying to *blame* anyone.

> Try my latest patch on the subject and report please, it should
> help *a lot*.
> 
> http://bundlebuggy.aaronbentley.com/request/%3Cm2k5my21jz.fsf@free.fr%3E

It does.  Thanks for pointing it out.

I had to tweak it slightly:

- --- http_server.py      2007-12-30 11:52:11.000000000 -0500
+++ /mnt/ntfs/bzr.win32fixes/bzrlib/tests/http_server.py
2007-12-30 12:07:22.000000000 -0500
@@ -344,7 +344,11 @@
          # 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:
+             if e.args[0] != 10057:
+                 raise
          # Let the server properly close the socket
          self.server_close()

After that, the tests that had been failing due to http server issues
passed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHd9OD0F+nu1YWqI0RAvvgAJ45ICz083Hm38bpdOUE+ezZCOW9xACeJ5tM
o+8sf78Uzn1e882i6RDHtQQ=
=hpSj
-----END PGP SIGNATURE-----



More information about the bazaar mailing list