/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_directory_service.py

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_directory_service.py
76
76
 
77
77
    def test_lookup_parent(self):
78
78
        self.assertAliasFromBranch(self.branch.set_parent, 'http://a',
79
 
                                  ':parent')
 
79
                                   ':parent')
80
80
 
81
81
    def test_lookup_submit(self):
82
82
        self.assertAliasFromBranch(self.branch.set_submit_branch, 'http://b',
115
115
    def test_register_location_alias(self):
116
116
        self.addCleanup(AliasDirectory.branch_aliases.remove, "booga")
117
117
        AliasDirectory.branch_aliases.register("booga",
118
 
            lambda b: "UHH?", help="Nobody knows")
 
118
                                               lambda b: "UHH?", help="Nobody knows")
119
119
        self.assertEqual("UHH?", directories.dereference(":booga"))
120
120
 
121
121
 
124
124
    def test_lookup_non_default(self):
125
125
        default = self.make_branch('.')
126
126
        non_default = default.controldir.create_branch(name='nondefault')
127
 
        self.assertEqual(non_default.base, directories.dereference('co:nondefault'))
 
127
        self.assertEqual(non_default.base,
 
128
                         directories.dereference('co:nondefault'))
128
129
 
129
130
    def test_lookup_default(self):
130
131
        default = self.make_branch('.')
131
132
        non_default = default.controldir.create_branch(name='nondefault')
132
133
        self.assertEqual(urlutils.join_segment_parameters(default.controldir.user_url,
133
 
            {"branch": ""}), directories.dereference('co:'))
 
134
                                                          {"branch": ""}), directories.dereference('co:'))
134
135
 
135
136
    def test_no_such_branch(self):
136
137
        # No error is raised in this case, that is up to the code that actually
137
138
        # opens the branch.
138
139
        default = self.make_branch('.')
139
140
        self.assertEqual(urlutils.join_segment_parameters(default.controldir.user_url,
140
 
            {"branch": "foo"}), directories.dereference('co:foo'))
 
141
                                                          {"branch": "foo"}), directories.dereference('co:foo'))