~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_versionedfile.py

  • Committer: Launchpad Translations on behalf of bzr-core
  • Date: 2013-06-04 04:30:59 UTC
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: launchpad_translations_on_behalf_of_bzr-core-20130604043059-h29l1boqg3a5ow14
Launchpad automatic translations update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
841
841
class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
842
842
 
843
843
    def setUp(self):
844
 
        super(TestPlanMergeVersionedFile, self).setUp()
 
844
        TestCaseWithMemoryTransport.setUp(self)
845
845
        mapper = PrefixMapper()
846
846
        factory = make_file_factory(True, mapper)
847
847
        self.vf1 = factory(self.get_transport('root-1'))
2746
2746
        return ret
2747
2747
 
2748
2748
    def setUp(self):
2749
 
        super(VirtualVersionedFilesTests, self).setUp()
 
2749
        TestCase.setUp(self)
2750
2750
        self._lines = {}
2751
2751
        self._parent_map = {}
2752
2752
        self.texts = VirtualVersionedFiles(self._get_parent_map,