← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_foreign_vcs/test_branch.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_foreign_vcs/test_branch.py
61
61
        branch = self.make_branch()
62
62
        branch.set_parent("foobar")
63
63
 
64
 
    def test_break_lock(self):
65
 
        """Test that break_lock() works, even if it is a no-op."""
66
 
        branch = self.make_branch()
67
 
        branch.break_lock()
68
 
 
69
64
    def test_set_push_location(self):
70
65
        """Test that setting the push location works."""
71
66
        branch = self.make_branch()
148
143
 
149
144
    def test_network_name(self):
150
145
        self.assertIsInstance(self.branch_format.network_name(), str)
151
 
 
152