← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_hooks.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-05 00:03:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5842.
  • Revision ID: jelmer@samba.org-20110505000349-mdcda2i3n7l8n30o
Fix remote branch tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_hooks.py
130
130
        expected_calls = [('set_rh', branch, [], True),
131
131
            ('set_rh', branch, [], True),
132
132
            ]
133
 
        if isinstance(branch, remote.RemoteBranch):
134
 
            # For a remote branch, both the server and the client will raise
135
 
            # set_rh, and the server will do so first because that is where
136
 
            # the change takes place.
137
 
            self.assertEqual(expected_calls, self.hook_calls[2:])
138
 
            self.assertEqual(4, len(self.hook_calls))
139
 
        else:
140
 
            self.assertEqual(expected_calls, self.hook_calls)
 
133
        self.assertEqual(expected_calls, self.hook_calls)
141
134
 
142
135
 
143
136
class TestOpen(tests.TestCaseWithMemoryTransport):