← 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

https://launchpad.net/bugs/524184
NEWS section template into a separate file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Tests of the bzr serve command."""
21
21
import signal
22
22
import subprocess
23
23
import sys
 
24
import thread
24
25
import threading
25
26
 
26
27
from bzrlib import (
27
28
    errors,
28
29
    osutils,
29
30
    revision as _mod_revision,
 
31
    transport,
30
32
    )
31
33
from bzrlib.branch import Branch
32
34
from bzrlib.bzrdir import BzrDir
33
35
from bzrlib.errors import ParamikoNotPresent
34
 
from bzrlib.smart import medium
 
36
from bzrlib.smart import client, medium
 
37
from bzrlib.smart.server import SmartTCPServer
35
38
from bzrlib.tests import TestCaseWithTransport, TestSkipped
 
39
from bzrlib.trace import mutter
36
40
from bzrlib.transport import get_transport, remote
37
41
 
38
42
 
48
52
        result = self.finish_bzr_subprocess(process)
49
53
        self.assertEqual('', result[0])
50
54
        self.assertEqual('', result[1])
51
 
    
 
55
 
52
56
    def assertServerFinishesCleanly(self, process):
53
57
        """Shutdown the bzr serve instance process looking for errors."""
54
58
        # Shutdown the server
97
101
        args = ['serve', '--port', 'localhost:0']
98
102
        args.extend(extra_options)
99
103
        process = self.start_bzr_subprocess(args, skip_if_plan_to_signal=True)
100
 
        port_line = process.stdout.readline()
 
104
        port_line = process.stderr.readline()
101
105
        prefix = 'listening on port: '
102
106
        self.assertStartsWith(port_line, prefix)
103
107
        port = int(port_line[len(prefix):])
138
142
        self.make_read_requests(branch)
139
143
        self.assertServerFinishesCleanly(process)
140
144
 
 
145
    def test_bzr_serve_supports_protocol(self):
 
146
        # Make a branch
 
147
        self.make_branch('.')
 
148
 
 
149
        process, url = self.start_server_port(['--allow-writes',
 
150
                                               '--protocol=bzr'])
 
151
 
 
152
        # Connect to the server
 
153
        branch = Branch.open(url)
 
154
        self.make_read_requests(branch)
 
155
        self.assertServerFinishesCleanly(process)
 
156
 
141
157
    def test_bzr_connect_to_bzr_ssh(self):
142
158
        """User acceptance that get_transport of a bzr+ssh:// behaves correctly.
143
159
 
148
164
        except ParamikoNotPresent:
149
165
            raise TestSkipped('Paramiko not installed')
150
166
        from bzrlib.tests.stub_sftp import StubServer
151
 
        
 
167
 
152
168
        # Make a branch
153
169
        self.make_branch('a_branch')
154
170
 
167
183
                proc = subprocess.Popen(
168
184
                    command, shell=True, stdin=subprocess.PIPE,
169
185
                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
170
 
                
 
186
 
171
187
                # XXX: horribly inefficient, not to mention ugly.
172
188
                # Start a thread for each of stdin/out/err, and relay bytes from
173
189
                # the subprocess to channel and vice versa.
200
216
        # Access the branch via a bzr+ssh URL.  The BZR_REMOTE_PATH environment
201
217
        # variable is used to tell bzr what command to run on the remote end.
202
218
        path_to_branch = osutils.abspath('a_branch')
203
 
        
 
219
 
204
220
        orig_bzr_remote_path = os.environ.get('BZR_REMOTE_PATH')
205
221
        bzr_remote_path = self.get_bzr_path()
206
222
        if sys.platform == 'win32':
226
242
            ['%s serve --inet --directory=/ --allow-writes'
227
243
             % bzr_remote_path],
228
244
            self.command_executed)
229
 
        
 
245
 
 
246
 
 
247
class TestCmdServeChrooting(TestCaseWithTransport):
 
248
 
 
249
    def test_serve_tcp(self):
 
250
        """'bzr serve' wraps the given --directory in a ChrootServer.
 
251
 
 
252
        So requests that search up through the parent directories (like
 
253
        find_repositoryV3) will give "not found" responses, rather than
 
254
        InvalidURLJoin or jail break errors.
 
255
        """
 
256
        t = self.get_transport()
 
257
        t.mkdir('server-root')
 
258
        self.run_bzr_serve_then_func(
 
259
            ['--port', '0', '--directory', t.local_abspath('server-root'),
 
260
             '--allow-writes'],
 
261
            self.when_server_started)
 
262
        # The when_server_started method issued a find_repositoryV3 that should
 
263
        # fail with 'norepository' because there are no repositories inside the
 
264
        # --directory.
 
265
        self.assertEqual(('norepository',), self.client_resp)
 
266
        
 
267
    def run_bzr_serve_then_func(self, serve_args, func, *func_args,
 
268
            **func_kwargs):
 
269
        """Run 'bzr serve', and run the given func in a thread once the server
 
270
        has started.
 
271
        
 
272
        When 'func' terminates, the server will be terminated too.
 
273
        """
 
274
        # install hook
 
275
        def on_server_start(backing_urls, tcp_server):
 
276
            t = threading.Thread(
 
277
                target=on_server_start_thread, args=(tcp_server,))
 
278
            t.start()
 
279
        def on_server_start_thread(tcp_server):
 
280
            try:
 
281
                # Run func
 
282
                self.tcp_server = tcp_server
 
283
                try:
 
284
                    func(*func_args, **func_kwargs)
 
285
                except Exception, e:
 
286
                    # Log errors to make some test failures a little less
 
287
                    # mysterious.
 
288
                    mutter('func broke: %r', e)
 
289
            finally:
 
290
                # Then stop the server
 
291
                mutter('interrupting...')
 
292
                thread.interrupt_main()
 
293
        SmartTCPServer.hooks.install_named_hook(
 
294
            'server_started_ex', on_server_start,
 
295
            'run_bzr_serve_then_func hook')
 
296
        # start a TCP server
 
297
        try:
 
298
            self.run_bzr(['serve'] + list(serve_args))
 
299
        except KeyboardInterrupt:
 
300
            pass
 
301
 
 
302
    def when_server_started(self):
 
303
        # Connect to the TCP server and issue some requests and see what comes
 
304
        # back.
 
305
        client_medium = medium.SmartTCPClientMedium(
 
306
            '127.0.0.1', self.tcp_server.port,
 
307
            'bzr://localhost:%d/' % (self.tcp_server.port,))
 
308
        smart_client = client._SmartClient(client_medium)
 
309
        resp = smart_client.call('mkdir', 'foo', '')
 
310
        resp = smart_client.call('BzrDirFormat.initialize', 'foo/')
 
311
        try:
 
312
            resp = smart_client.call('BzrDir.find_repositoryV3', 'foo/')
 
313
        except errors.ErrorFromSmartServer, e:
 
314
            resp = e.error_tuple
 
315
        self.client_resp = resp
 
316
        client_medium.disconnect()
 
317
 
 
318
 
 
319