~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2008-08-07 00:25:38 UTC
  • mfrom: (3612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3613.
  • Revision ID: andrew.bennetts@canonical.com-20080807002538-mtl1fcgy2fdabha4
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
 
50
50
 
51
51
from bzrlib import (
 
52
    branchbuilder,
52
53
    bzrdir,
53
54
    debug,
54
55
    errors,
1993
1994
        b = self.make_branch(relpath, format=format)
1994
1995
        return memorytree.MemoryTree.create_on_branch(b)
1995
1996
 
 
1997
    def make_branch_builder(self, relpath, format=None):
 
1998
        url = self.get_url(relpath)
 
1999
        tran = get_transport(url)
 
2000
        return branchbuilder.BranchBuilder(get_transport(url), format=format)
 
2001
 
1996
2002
    def overrideEnvironmentForTesting(self):
1997
2003
        os.environ['HOME'] = self.test_home_dir
1998
2004
        os.environ['BZR_HOME'] = self.test_home_dir
2132
2138
            tree = workingtree.WorkingTree.open(root_path)
2133
2139
        if not isinstance(path, basestring):
2134
2140
            for p in path:
2135
 
                self.assertInWorkingTree(p,tree=tree)
 
2141
                self.assertInWorkingTree(p, tree=tree)
2136
2142
        else:
2137
2143
            self.assertIsNot(tree.path2id(path), None,
2138
2144
                path+' not in working tree.')
2757
2763
                   'bzrlib.tests.test_osutils',
2758
2764
                   'bzrlib.tests.test_osutils_encodings',
2759
2765
                   'bzrlib.tests.test_pack',
 
2766
                   'bzrlib.tests.test_pack_repository',
2760
2767
                   'bzrlib.tests.test_patch',
2761
2768
                   'bzrlib.tests.test_patches',
2762
2769
                   'bzrlib.tests.test_permissions',
2808
2815
                   'bzrlib.tests.test_ui',
2809
2816
                   'bzrlib.tests.test_uncommit',
2810
2817
                   'bzrlib.tests.test_upgrade',
 
2818
                   'bzrlib.tests.test_upgrade_stacked',
2811
2819
                   'bzrlib.tests.test_urlutils',
2812
2820
                   'bzrlib.tests.test_versionedfile',
2813
2821
                   'bzrlib.tests.test_version',