← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_versionedfile.py

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_versionedfile.py
841
841
class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport):
842
842
 
843
843
    def setUp(self):
844
 
        TestCaseWithMemoryTransport.setUp(self)
 
844
        super(TestPlanMergeVersionedFile, self).setUp()
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
 
        TestCase.setUp(self)
 
2749
        super(VirtualVersionedFilesTests, self).setUp()
2750
2750
        self._lines = {}
2751
2751
        self._parent_map = {}
2752
2752
        self.texts = VirtualVersionedFiles(self._get_parent_map,