~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_setup.py

  • Committer: Robert Collins
  • Date: 2009-03-31 00:12:10 UTC
  • mto: This revision was merged to the branch mainline in revision 4219.
  • Revision ID: robertc@robertcollins.net-20090331001210-fufeq2heozx9jne0
Fix Tree.get_symlink_target to decode from the disk encoding to get a unicode encoded string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 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
74
74
        self.log('args: %r', args)
75
75
        p = subprocess.Popen(args,
76
76
                             cwd=self.source_dir,
77
 
                             stdout=subprocess.PIPE,
78
 
                             stderr=subprocess.PIPE,
 
77
                             stdout=self._log_file,
 
78
                             stderr=self._log_file,
79
79
                             )
80
 
        stdout, stderr = p.communicate()
81
 
        self.log('stdout: %r', stdout)
82
 
        self.log('stderr: %r', stderr)
 
80
        s = p.communicate()
83
81
        self.assertEqual(0, p.returncode,
84
82
                         'invocation of %r failed' % args)