/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_serve.py
84
84
                interrupt_main()
85
85
        # When the hook is fired, it just starts ``on_server_start_thread`` and
86
86
        # return
 
87
 
87
88
        def on_server_start(backing_urls, tcp_server):
88
89
            t = threading.Thread(
89
90
                target=on_server_start_thread, args=(tcp_server,))
102
103
                                    retcode=retcode)
103
104
        except KeyboardInterrupt as e:
104
105
            return (self._last_cmd_stdout.getvalue(),
105
 
                self._last_cmd_stderr.getvalue())
 
106
                    self._last_cmd_stderr.getvalue())
106
107
        return out, err
107
108
 
108
109
 
315
316
        self.assertServerFinishesCleanly(process)
316
317
 
317
318
    def test_bzr_serve_graceful_shutdown(self):
318
 
        big_contents = b'a'*64*1024
 
319
        big_contents = b'a' * 64 * 1024
319
320
        self.build_tree_contents([('bigfile', big_contents)])
320
321
        process, url = self.start_server_port(['--client-timeout=1.0'])
321
322
        t = transport.get_transport_from_url(url)
414
415
 
415
416
    def test_bzr_serve_does_not_expand_userdir_outside_base(self):
416
417
        bzr_server = self.make_test_server('/foo')
417
 
        self.assertFalse(bzr_server.smart_server.backing_transport.has('~user'))
 
418
        self.assertFalse(
 
419
            bzr_server.smart_server.backing_transport.has('~user'))
418
420
 
419
421
    def test_get_base_path(self):
420
422
        """cmd_serve will turn the --directory option into a LocalTransport
426
428
        base_url = urlutils.local_path_to_url(base_dir) + '/'
427
429
        # Define a fake 'protocol' to capture the transport that cmd_serve
428
430
        # passes to serve_bzr.
 
431
 
429
432
        def capture_transport(transport, host, port, inet, timeout):
430
433
            self.bzr_serve_transport = transport
431
434
        cmd = builtins.cmd_serve()
438
441
            base_dir, server_maker.get_base_path(self.bzr_serve_transport))
439
442
        # Read-write
440
443
        cmd.run(directory=base_dir, protocol=capture_transport,
441
 
            allow_writes=True)
 
444
                allow_writes=True)
442
445
        server_maker = BzrServerFactory()
443
446
        self.assertEqual(base_url, self.bzr_serve_transport.base)
444
447
        self.assertEqual(base_dir,
445
 
            server_maker.get_base_path(self.bzr_serve_transport))
 
448
                         server_maker.get_base_path(self.bzr_serve_transport))
446
449
        # Read-only, from a URL
447
450
        cmd.run(directory=base_url, protocol=capture_transport)
448
451
        server_maker = BzrServerFactory()