← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_serve.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-04-07 07:52:50 UTC
  • mfrom: (3340.1.1 208418-1.4)
  • Revision ID: pqm@pqm.ubuntu.com-20080407075250-phs53xnslo8boaeo
Return the correct knit serialisation method in _StreamAccess.
        (Andrew Bennetts, Martin Pool, Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
26
26
from bzrlib import (
27
27
    errors,
28
28
    osutils,
 
29
    revision as _mod_revision,
29
30
    )
30
31
from bzrlib.branch import Branch
31
32
from bzrlib.bzrdir import BzrDir
44
45
        process.stdin.close()
45
46
        # Hide stdin from the subprocess module, so it won't fail to close it.
46
47
        process.stdin = None
47
 
        result = self.finish_bzr_subprocess(process, retcode=0)
 
48
        result = self.finish_bzr_subprocess(process)
48
49
        self.assertEqual('', result[0])
49
50
        self.assertEqual('', result[1])
50
51
    
56
57
        self.assertEqual('', result[0])
57
58
        self.assertEqual('bzr: interrupted\n', result[1])
58
59
 
 
60
    def make_read_requests(self, branch):
 
61
        """Do some read only requests."""
 
62
        branch.lock_read()
 
63
        try:
 
64
            branch.repository.all_revision_ids()
 
65
            self.assertEqual(_mod_revision.NULL_REVISION,
 
66
                             _mod_revision.ensure_null(branch.last_revision()))
 
67
        finally:
 
68
            branch.unlock()
 
69
 
59
70
    def start_server_inet(self, extra_options=()):
60
71
        """Start a bzr server subprocess using the --inet option.
61
72
 
106
117
 
107
118
        # We get a working branch
108
119
        branch = BzrDir.open_from_transport(transport).open_branch()
109
 
        branch.repository.get_revision_graph()
110
 
        self.assertEqual(None, branch.last_revision())
 
120
        self.make_read_requests(branch)
111
121
        self.assertInetServerShutsdownCleanly(process)
112
122
 
113
123
    def test_bzr_serve_port_readonly(self):
125
135
 
126
136
        # Connect to the server
127
137
        branch = Branch.open(url)
128
 
 
129
 
        # We get a working branch
130
 
        branch.repository.get_revision_graph()
131
 
        self.assertEqual(None, branch.last_revision())
132
 
 
 
138
        self.make_read_requests(branch)
133
139
        self.assertServerFinishesCleanly(process)
134
140
 
135
141
    def test_bzr_connect_to_bzr_ssh(self):
205
211
                path_to_branch = os.path.splitdrive(path_to_branch)[1]
206
212
            branch = Branch.open(
207
213
                'bzr+ssh://fred:secret@localhost:%d%s' % (port, path_to_branch))
208
 
            
209
 
            branch.repository.get_revision_graph()
210
 
            self.assertEqual(None, branch.last_revision())
 
214
            self.make_read_requests(branch)
211
215
            # Check we can perform write operations
212
216
            branch.bzrdir.root_transport.mkdir('foo')
213
217
        finally: