Rev 4794: Merge the test-serve fix in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite
John Arbash Meinel
john at arbash-meinel.com
Sun Nov 8 01:38:06 GMT 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite
------------------------------------------------------------
revno: 4794 [merge]
revision-id: john at arbash-meinel.com-20091108013758-kcgo6ih171q1x3an
parent: john at arbash-meinel.com-20091108013044-astr2p91su63q8yi
parent: john at arbash-meinel.com-20091108013632-9tilit2pp2rbb9c2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-suite
timestamp: Sat 2009-11-07 19:37:58 -0600
message:
Merge the test-serve fix
modified:
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2009-09-22 04:25:05 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2009-11-08 01:36:32 +0000
@@ -278,23 +278,26 @@
(optionally decorated with 'readonly+'). BzrServerFactory can
determine the original --directory from that transport.
"""
+ base_dir = '/a/b/c/'
+ if sys.platform == 'win32':
+ base_dir = 'C:/a/b/c/'
# Define a fake 'protocol' to capture the transport that cmd_serve
# passes to serve_bzr.
def capture_transport(transport, host, port, inet):
self.bzr_serve_transport = transport
cmd = builtins.cmd_serve()
# Read-only
- cmd.run(directory='/a/b/c', protocol=capture_transport)
+ cmd.run(directory=base_dir, protocol=capture_transport)
server_maker = BzrServerFactory()
self.assertEqual(
- 'readonly+file:///a/b/c/', self.bzr_serve_transport.base)
+ 'readonly+file:///%s' % base_dir, self.bzr_serve_transport.base)
self.assertEqual(
- u'/a/b/c/', server_maker.get_base_path(self.bzr_serve_transport))
+ base_dir, server_maker.get_base_path(self.bzr_serve_transport))
# Read-write
- cmd.run(directory='/a/b/c', protocol=capture_transport,
+ cmd.run(directory=base_dir, protocol=capture_transport,
allow_writes=True)
server_maker = BzrServerFactory()
- self.assertEqual('file:///a/b/c/', self.bzr_serve_transport.base)
- self.assertEqual(
- u'/a/b/c/', server_maker.get_base_path(self.bzr_serve_transport))
+ self.assertEqual('file:///%s' % base_dir, self.bzr_serve_transport.base)
+ self.assertEqual(base_dir,
+ server_maker.get_base_path(self.bzr_serve_transport))
More information about the bazaar-commits
mailing list