[Pkg-bazaar-commits] ./bzr/unstable r560: - fix testbzr for win32

[Martin Pool]

------------------------------------------------------------
revno: 560
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-05-26 12:27:22 +1000
message:
  - fix testbzr for win32
    (patch from John A Meinel)
modified:
  testbzr
-------------- next part --------------
=== modified file 'testbzr'
--- a/testbzr	2005-05-19 11:11:53 +0000
+++ b/testbzr	2005-05-26 02:27:22 +0000
@@ -277,7 +277,7 @@
     runcmd("bzr add sub1")
     runcmd("bzr rename sub1 sub2")
     runcmd("bzr move hello.txt sub2")
-    assert backtick("bzr relpath sub2/hello.txt") == "sub2/hello.txt\n"
+    assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
 
     assert exists("sub2")
     assert exists("sub2/hello.txt")
@@ -301,11 +301,11 @@
     assert backtick('bzr root')[:-1] == os.path.join(test_root, 'branch1')
     runcmd('bzr move ../hello.txt .')
     assert exists('./hello.txt')
-    assert backtick('bzr relpath hello.txt') == 'sub1/sub2/hello.txt\n'
-    assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == 'sub1/sub2/hello.txt\n'
+    assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
+    assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
     runcmd(['bzr', 'commit', '-m', 'move to parent directory'])
     cd('..')
-    assert backtick('bzr relpath sub2/hello.txt') == 'sub1/sub2/hello.txt\n'
+    assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
 
     runcmd('bzr move sub2/hello.txt .')
     assert exists('hello.txt')