~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_init.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
 
25
    osutils,
25
26
    urlutils,
26
27
    )
27
28
from bzrlib.bzrdir import BzrDirMetaFormat1
74
75
Using shared repository: %s
75
76
""" % (self._default_label, urlutils.local_path_from_url(
76
77
            repo.bzrdir.root_transport.external_url())), out)
77
 
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
78
 
            "test_init_at_repository_root/work/repo/\n")
 
78
        cwd = osutils.getcwd()
 
79
        self.assertEndsWith(out, cwd + '/repo/\n')
79
80
        self.assertEqual('', err)
80
81
        newdir.open_branch()
81
82
        newdir.open_workingtree()