~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: Vincent Ladeuil
  • Date: 2012-08-04 14:27:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6553.
  • Revision ID: v.ladeuil+lp@free.fr-20120804142747-2t498paljijf7q7y
Remaining tests matching setup(self) that can be rewritten with super().

Show diffs side-by-side

added added

removed removed

Lines of Context:
209
209
    """Tests that the 'merge_file_content' hook is invoked."""
210
210
 
211
211
    def setUp(self):
212
 
        TestCaseWithTransport.setUp(self)
 
212
        super(TestHookMergeFileContent, self).setUp()
213
213
        self.hook_log = []
214
214
 
215
215
    def install_hook_inactive(self):