← 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: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

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'))
904
904
        # we should be able to read from http with a versioned file.
905
905
        vf = self.get_file()
906
906
        # try an empty file access
907
 
        readonly_vf = self.get_factory()('foo', transport.get_transport(
908
 
                self.get_readonly_url('.')))
 
907
        readonly_vf = self.get_factory()('foo',
 
908
            transport.get_transport_from_url(self.get_readonly_url('.')))
909
909
        self.assertEqual([], readonly_vf.versions())
910
910
 
911
911
    def test_readonly_http_works_with_feeling(self):
914
914
        # now with feeling.
915
915
        vf.add_lines('1', [], ['a\n'])
916
916
        vf.add_lines('2', ['1'], ['b\n', 'a\n'])
917
 
        readonly_vf = self.get_factory()('foo', transport.get_transport(
918
 
                self.get_readonly_url('.')))
 
917
        readonly_vf = self.get_factory()('foo',
 
918
            transport.get_transport_from_url(self.get_readonly_url('.')))
919
919
        self.assertEqual(['1', '2'], vf.versions())
920
920
        self.assertEqual(['1', '2'], readonly_vf.versions())
921
921
        for version in readonly_vf.versions():
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,