← 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: John Arbash Meinel
  • Date: 2010-05-11 14:13:31 UTC
  • mto: (5218.2.2 bytes_to_entry_c)
  • mto: This revision was merged to the branch mainline in revision 5225.
  • Revision ID: john@arbash-meinel.com-20100511141331-rizo2ez6bze3ao66
Some small tweaks to the chk_map code.

Find out that we actually weren't using the global definition because we
were assigning inside the if block. So factor that out into a helper.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_versionedfile.py
31
31
    knit as _mod_knit,
32
32
    osutils,
33
33
    progress,
34
 
    transport,
35
34
    ui,
36
35
    )
37
36
from bzrlib.errors import (
57
56
    )
58
57
from bzrlib.tests.http_utils import TestCaseWithWebserver
59
58
from bzrlib.trace import mutter
 
59
from bzrlib.transport import get_transport
60
60
from bzrlib.transport.memory import MemoryTransport
61
61
from bzrlib.tsort import topo_sort
62
62
from bzrlib.tuned_gzip import GzipFile
849
849
        self.assertEquals(('references_ghost', 'line_c\n'), origins[2])
850
850
 
851
851
    def test_readonly_mode(self):
852
 
        t = transport.get_transport(self.get_url('.'))
 
852
        transport = get_transport(self.get_url('.'))
853
853
        factory = self.get_factory()
854
 
        vf = factory('id', t, 0777, create=True, access_mode='w')
855
 
        vf = factory('id', t, access_mode='r')
 
854
        vf = factory('id', transport, 0777, create=True, access_mode='w')
 
855
        vf = factory('id', transport, access_mode='r')
856
856
        self.assertRaises(errors.ReadOnlyError, vf.add_lines, 'base', [], [])
857
857
        self.assertRaises(errors.ReadOnlyError,
858
858
                          vf.add_lines_with_ghosts,
880
880
class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn):
881
881
 
882
882
    def get_file(self, name='foo'):
883
 
        return WeaveFile(name, transport.get_transport(self.get_url('.')),
884
 
                         create=True,
885
 
                         get_scope=self.get_transaction)
 
883
        return WeaveFile(name, get_transport(self.get_url('.')), create=True,
 
884
            get_scope=self.get_transaction)
886
885
 
887
886
    def get_file_corrupted_text(self):
888
 
        w = WeaveFile('foo', transport.get_transport(self.get_url('.')),
889
 
                      create=True,
890
 
                      get_scope=self.get_transaction)
 
887
        w = WeaveFile('foo', get_transport(self.get_url('.')), create=True,
 
888
            get_scope=self.get_transaction)
891
889
        w.add_lines('v1', [], ['hello\n'])
892
890
        w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
893
891
 
921
919
        return w
922
920
 
923
921
    def reopen_file(self, name='foo', create=False):
924
 
        return WeaveFile(name, transport.get_transport(self.get_url('.')),
925
 
                         create=create,
926
 
                         get_scope=self.get_transaction)
 
922
        return WeaveFile(name, get_transport(self.get_url('.')), create=create,
 
923
            get_scope=self.get_transaction)
927
924
 
928
925
    def test_no_implicit_create(self):
929
926
        self.assertRaises(errors.NoSuchFile,
930
927
                          WeaveFile,
931
928
                          'foo',
932
 
                          transport.get_transport(self.get_url('.')),
 
929
                          get_transport(self.get_url('.')),
933
930
                          get_scope=self.get_transaction)
934
931
 
935
932
    def get_factory(self):
1002
999
        # we should be able to read from http with a versioned file.
1003
1000
        vf = self.get_file()
1004
1001
        # try an empty file access
1005
 
        readonly_vf = self.get_factory()('foo', transport.get_transport(
1006
 
                self.get_readonly_url('.')))
 
1002
        readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
1007
1003
        self.assertEqual([], readonly_vf.versions())
1008
 
 
1009
 
    def test_readonly_http_works_with_feeling(self):
1010
 
        # we should be able to read from http with a versioned file.
1011
 
        vf = self.get_file()
1012
1004
        # now with feeling.
1013
1005
        vf.add_lines('1', [], ['a\n'])
1014
1006
        vf.add_lines('2', ['1'], ['b\n', 'a\n'])
1015
 
        readonly_vf = self.get_factory()('foo', transport.get_transport(
1016
 
                self.get_readonly_url('.')))
 
1007
        readonly_vf = self.get_factory()('foo', get_transport(self.get_readonly_url('.')))
1017
1008
        self.assertEqual(['1', '2'], vf.versions())
1018
 
        self.assertEqual(['1', '2'], readonly_vf.versions())
1019
1009
        for version in readonly_vf.versions():
1020
1010
            readonly_vf.get_lines(version)
1021
1011
 
1023
1013
class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin):
1024
1014
 
1025
1015
    def get_file(self):
1026
 
        return WeaveFile('foo', transport.get_transport(self.get_url('.')),
1027
 
                         create=True,
1028
 
                         get_scope=self.get_transaction)
 
1016
        return WeaveFile('foo', get_transport(self.get_url('.')), create=True,
 
1017
            get_scope=self.get_transaction)
1029
1018
 
1030
1019
    def get_factory(self):
1031
1020
        return WeaveFile
1275
1264
class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin):
1276
1265
 
1277
1266
    def get_file(self, name='foo'):
1278
 
        return WeaveFile(name, transport.get_transport(self.get_url('.')),
1279
 
                         create=True)
 
1267
        return WeaveFile(name, get_transport(self.get_url('.')), create=True)
1280
1268
 
1281
1269
    def log_contents(self, w):
1282
1270
        self.log('weave is:')