← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.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:
bzrlib/tests/test_merge.py
559
559
class TestPlanMerge(TestCaseWithMemoryTransport):
560
560
 
561
561
    def setUp(self):
562
 
        TestCaseWithMemoryTransport.setUp(self)
 
562
        super(TestPlanMerge, self).setUp()
563
563
        mapper = versionedfile.PrefixMapper()
564
564
        factory = knit.make_file_factory(True, mapper)
565
565
        self.vf = factory(self.get_transport())