~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Matthew Fuller
  • Date: 2009-08-18 08:10:44 UTC
  • mto: (4772.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4773.
  • Revision ID: fullermd@over-yonder.net-20090818081044-2due6ius01c4pwjl
Fix up some doctests to handle things ending up as RevisionSpec_dwim's
instead of RS_revno, and ending up as _dwim's (which may error
eventually, but won't until we try to evaluate them) instead of
insta-errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 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,
26
25
    urlutils,
27
26
    )
28
27
from bzrlib.bzrdir import BzrDirMetaFormat1
36
35
 
37
36
    def setUp(self):
38
37
        ExternalBase.setUp(self)
39
 
        self._default_label = '2a'
 
38
        self._default_label = 'pack-0.92'
40
39
 
41
40
    def test_init_with_format(self):
42
41
        # Verify bzr init --format constructs something plausible
75
74
Using shared repository: %s
76
75
""" % (self._default_label, urlutils.local_path_from_url(
77
76
            repo.bzrdir.root_transport.external_url())), out)
78
 
        cwd = osutils.getcwd()
79
 
        self.assertEndsWith(out, cwd + '/repo/\n')
 
77
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
 
78
            "test_init_at_repository_root/work/repo/\n")
80
79
        self.assertEqual('', err)
81
80
        newdir.open_branch()
82
81
        newdir.open_workingtree()