← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
1
 
# Copyright (C) 2010, 2011, 2012, 2016 Canonical Ltd
 
1
# Copyright (C) 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
21
21
 
22
22
import bzrlib.branch
23
23
from bzrlib import (
 
24
    branch,
24
25
    bzrdir,
25
 
    controldir,
26
26
    errors,
27
27
    repository,
28
28
    revision as _mod_revision,
657
657
            raise TestNotApplicable('Only relevant for stackable formats.')
658
658
        # Initialize a bzrdir subject to the policy.
659
659
        t = self.get_transport('stacked')
660
 
        repo_fmt = controldir.format_registry.make_bzrdir('1.9')
 
660
        repo_fmt = bzrdir.format_registry.make_bzrdir('1.9')
661
661
        repo_name = repo_fmt.repository_format.network_name()
662
662
        repo, control = self.assertInitializeEx(
663
663
            t, need_meta=True, repo_format_name=repo_name, stacked_on=None)
679
679
                "format does not support colocated branches")
680
680
        branch = self.make_branch('.', format='development-colo')
681
681
        branch.bzrdir.create_branch(name="another-colocated-branch")
682
 
        self.assertEqual(
 
682
        self.assertEquals(
683
683
            branch.bzrdir.user_transport.list_dir("."),
684
684
            [".bzr"])
685
685