/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 bzrlib/tests/blackbox/test_serve.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
1
 
# Copyright (C) 2006 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
38
38
from bzrlib.smart import client, medium
39
39
from bzrlib.smart.server import BzrServerFactory, SmartTCPServer
40
40
from bzrlib.tests import (
41
 
    ParamikoFeature,
42
41
    TestCaseWithMemoryTransport,
43
42
    TestCaseWithTransport,
44
43
    TestSkipped,
233
232
        f = open(log_fname, 'rb')
234
233
        content = f.read()
235
234
        f.close()
236
 
        self.assertContainsRe(content, 'hpss request: \[')
 
235
        self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
237
236
 
238
237
 
239
238
class TestCmdServeChrooting(TestBzrServeBase):
288
287
        return path
289
288
 
290
289
    def make_test_server(self, base_path='/'):
291
 
        """Make and setUp a BzrServerFactory, backed by a memory transport, and
 
290
        """Make and start a BzrServerFactory, backed by a memory transport, and
292
291
        creat '/home/user' in that transport.
293
292
        """
294
293
        bzr_server = BzrServerFactory(