← 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: 2010-05-28 00:25:32 UTC
  • mfrom: (5264.1.2 command-help-bug-177500)
  • Revision ID: pqm@pqm.ubuntu.com-20100528002532-9bzj1fajyxckd1rg
(lifeless) Stop raising at runtime when a command has no help,
 instead have a test in the test suite that checks all known command objects.
 (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Tests of the bzr serve command."""
19
19
 
20
20
import os
 
21
import os.path
21
22
import signal
 
23
import subprocess
22
24
import sys
23
25
import thread
24
26
import threading
25
27
 
26
28
from bzrlib import (
27
29
    builtins,
 
30
    debug,
28
31
    errors,
29
32
    osutils,
30
33
    revision as _mod_revision,
31
 
    trace,
32
 
    transport,
33
34
    urlutils,
34
35
    )
35
36
from bzrlib.branch import Branch
36
37
from bzrlib.bzrdir import BzrDir
37
38
from bzrlib.smart import client, medium
38
 
from bzrlib.smart.server import (
39
 
    BzrServerFactory,
40
 
    SmartTCPServer,
41
 
    )
 
39
from bzrlib.smart.server import BzrServerFactory, SmartTCPServer
42
40
from bzrlib.tests import (
43
41
    TestCaseWithMemoryTransport,
44
42
    TestCaseWithTransport,
 
43
    TestSkipped,
45
44
    )
46
 
from bzrlib.transport import remote
 
45
from bzrlib.trace import mutter
 
46
from bzrlib.transport import get_transport, remote
47
47
 
48
48
 
49
49
class TestBzrServeBase(TestCaseWithTransport):
52
52
                                *func_args, **func_kwargs):
53
53
        """Run 'bzr serve', and run the given func in a thread once the server
54
54
        has started.
55
 
 
 
55
        
56
56
        When 'func' terminates, the server will be terminated too.
57
 
 
 
57
        
58
58
        Returns stdout and stderr.
59
59
        """
 
60
        # install hook
 
61
        def on_server_start(backing_urls, tcp_server):
 
62
            t = threading.Thread(
 
63
                target=on_server_start_thread, args=(tcp_server,))
 
64
            t.start()
60
65
        def on_server_start_thread(tcp_server):
61
 
            """This runs concurrently with the server thread.
62
 
 
63
 
            The server is interrupted as soon as ``func`` finishes, even if an
64
 
            exception is encountered.
65
 
            """
66
66
            try:
67
67
                # Run func if set
68
68
                self.tcp_server = tcp_server
72
72
                    except Exception, e:
73
73
                        # Log errors to make some test failures a little less
74
74
                        # mysterious.
75
 
                        trace.mutter('func broke: %r', e)
 
75
                        mutter('func broke: %r', e)
76
76
            finally:
77
77
                # Then stop the server
78
 
                trace.mutter('interrupting...')
 
78
                mutter('interrupting...')
79
79
                thread.interrupt_main()
80
 
        # When the hook is fired, it just starts ``on_server_start_thread`` and
81
 
        # return
82
 
        def on_server_start(backing_urls, tcp_server):
83
 
            t = threading.Thread(
84
 
                target=on_server_start_thread, args=(tcp_server,))
85
 
            t.start()
86
 
        # install hook
87
80
        SmartTCPServer.hooks.install_named_hook(
88
81
            'server_started_ex', on_server_start,
89
82
            'run_bzr_serve_then_func hook')
90
83
        # start a TCP server
91
84
        try:
92
 
            out, err = self.run_bzr(['serve'] + list(serve_args),
93
 
                                    retcode=retcode)
 
85
            out, err = self.run_bzr(['serve'] + list(serve_args))
94
86
        except KeyboardInterrupt, e:
95
87
            out, err = e.args
96
88
        return out, err
102
94
        super(TestBzrServe, self).setUp()
103
95
        self.disable_missing_extensions_warning()
104
96
 
105
 
    def test_server_exception_with_hook(self):
106
 
        """Catch exception from the server in the server_exception hook.
107
 
 
108
 
        We use ``run_bzr_serve_then_func`` without a ``func`` so the server
109
 
        will receive a KeyboardInterrupt exception we want to catch.
110
 
        """
111
 
        def hook(exception):
112
 
            if exception[0] is KeyboardInterrupt:
113
 
                sys.stderr.write('catching KeyboardInterrupt\n')
114
 
                return True
115
 
            else:
116
 
                return False
117
 
        SmartTCPServer.hooks.install_named_hook(
118
 
            'server_exception', hook,
119
 
            'test_server_except_hook hook')
120
 
        args = ['--port', 'localhost:0', '--quiet']
121
 
        out, err = self.run_bzr_serve_then_func(args, retcode=0)
122
 
        self.assertEqual('catching KeyboardInterrupt\n', err)
123
 
 
124
 
    def test_server_exception_no_hook(self):
125
 
        """test exception without hook returns error"""
126
 
        args = []
127
 
        out, err = self.run_bzr_serve_then_func(args, retcode=3)
128
 
 
129
97
    def assertInetServerShutsdownCleanly(self, process):
130
98
        """Shutdown the server process looking for errors."""
131
99
        # Shutdown the server: the server should shut down when it cannot read
195
163
        url = 'bzr://localhost:%d/' % port
196
164
        self.permit_url(url)
197
165
        return process, url
198
 
 
 
166
    
199
167
    def test_bzr_serve_quiet(self):
200
168
        self.make_branch('.')
201
169
        args = ['--port', 'localhost:0', '--quiet']
224
192
    def test_bzr_serve_port_readonly(self):
225
193
        """bzr server should provide a read only filesystem by default."""
226
194
        process, url = self.start_server_port()
227
 
        t = transport.get_transport(url)
228
 
        self.assertRaises(errors.TransportNotPossible, t.mkdir, 'adir')
 
195
        transport = get_transport(url)
 
196
        self.assertRaises(errors.TransportNotPossible, transport.mkdir, 'adir')
229
197
        self.assertServerFinishesCleanly(process)
230
198
 
231
199
    def test_bzr_serve_port_readwrite(self):
256
224
        # -Dhpss, and does drop some hpss logging to the file.
257
225
        self.make_branch('.')
258
226
        log_fname = os.getcwd() + '/server.log'
259
 
        self.overrideEnv('BZR_LOG', log_fname)
 
227
        self._captureVar('BZR_LOG', log_fname)
260
228
        process, transport = self.start_server_inet(['-Dhpss'])
261
229
        branch = BzrDir.open_from_transport(transport).open_branch()
262
230
        self.make_read_requests(branch)
307
275
 
308
276
class TestUserdirExpansion(TestCaseWithMemoryTransport):
309
277
 
310
 
    @staticmethod
311
 
    def fake_expanduser(path):
 
278
    def fake_expanduser(self, path):
312
279
        """A simple, environment-independent, function for the duration of this
313
280
        test.
314
281
 
366
333
        self.assertEqual(base_url, self.bzr_serve_transport.base)
367
334
        self.assertEqual(base_dir,
368
335
            server_maker.get_base_path(self.bzr_serve_transport))
 
336