← 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: John Arbash Meinel
  • Date: 2009-12-22 17:14:45 UTC
  • mto: This revision was merged to the branch mainline in revision 4922.
  • Revision ID: john@arbash-meinel.com-20091222171445-fm7lcwhmkfdkc01q
Handle the fact that osutils requires the feature to be available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_serve.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
232
232
        f = open(log_fname, 'rb')
233
233
        content = f.read()
234
234
        f.close()
235
 
        self.assertContainsRe(content, r'hpss request: \[[0-9-]+\]')
 
235
        self.assertContainsRe(content, 'hpss request: \[')
236
236
 
237
237
 
238
238
class TestCmdServeChrooting(TestBzrServeBase):
287
287
        return path
288
288
 
289
289
    def make_test_server(self, base_path='/'):
290
 
        """Make and start a BzrServerFactory, backed by a memory transport, and
 
290
        """Make and setUp a BzrServerFactory, backed by a memory transport, and
291
291
        creat '/home/user' in that transport.
292
292
        """
293
293
        bzr_server = BzrServerFactory(