Rev 4795: merge fix for test-at-root in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-win32-test-suite

------------------------------------------------------------
revno: 4795 [merge]
revision-id: john at arbash-meinel.com-20091108022420-3g8i3t293d18pq0u
parent: john at arbash-meinel.com-20091108013758-kcgo6ih171q1x3an
parent: john at arbash-meinel.com-20091108022313-ggyjzlanjci2bgzn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-win32-test-suite
timestamp: Sat 2009-11-07 20:24:20 -0600
message:
  merge fix for test-at-root
modified:
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py	2009-08-12 22:16:29 +0000
+++ b/bzrlib/tests/blackbox/test_init.py	2009-11-08 02:23:13 +0000
@@ -22,6 +22,7 @@
 
 from bzrlib import (
     branch as _mod_branch,
+    osutils,
     urlutils,
     )
 from bzrlib.bzrdir import BzrDirMetaFormat1
@@ -74,8 +75,8 @@
 Using shared repository: %s
 """ % (self._default_label, urlutils.local_path_from_url(
             repo.bzrdir.root_transport.external_url())), out)
-        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
-            "test_init_at_repository_root/work/repo/\n")
+        cwd = osutils.getcwd()
+        self.assertEndsWith(out, cwd + '/repo/\n')
         self.assertEqual('', err)
         newdir.open_branch()
         newdir.open_workingtree()