← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_trace.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-21 17:22:25 UTC
  • mfrom: (5626.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110121172225-7mybq84k4ikcails
(vila) Merge 2.3 into trunk including bugfix for #701940 (Vincent
        Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_trace.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
301
301
        # set up.
302
302
        self.overrideAttr(sys, 'stderr', StringIO())
303
303
        # Set the log file to something that cannot exist
304
 
        # FIXME: A bit dangerous: we are not in an isolated dir here -- vilajam
305
 
        # 20100125
306
 
        os.environ['BZR_LOG'] = os.getcwd() + '/no-dir/bzr.log'
 
304
        self.overrideEnv('BZR_LOG', os.getcwd() + '/no-dir/bzr.log')
307
305
        self.overrideAttr(trace, '_bzr_log_filename')
308
306
        logf = trace._open_bzr_log()
309
307
        self.assertIs(None, logf)