~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_checkout.py

  • Committer: Matt Nordhoff
  • Date: 2009-06-23 05:12:07 UTC
  • mto: This revision was merged to the branch mainline in revision 4474.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623051207-fksdtbzkwtnrw9dd
Update _add_text docstrings that still referred to add_text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2009 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
28
28
    errors,
29
29
    workingtree,
30
30
    )
31
 
from bzrlib.tests.blackbox import (
32
 
    ExternalBase,
33
 
    )
34
 
from bzrlib.tests import (
35
 
    HardlinkFeature,
36
 
    KnownFailure,
37
 
    )
 
31
from bzrlib.tests.blackbox import ExternalBase
 
32
from bzrlib.tests import HardlinkFeature
38
33
 
39
34
 
40
35
class TestCheckout(ExternalBase):
155
150
        self.build_tree(['source/file1'])
156
151
        source.add('file1')
157
152
        source.commit('added file')
158
 
        out, err = self.run_bzr(['checkout', 'source', 'target',
159
 
            '--files-from', 'source',
160
 
            '--hardlink'])
 
153
        self.run_bzr(['checkout', 'source', 'target', '--files-from', 'source',
 
154
                      '--hardlink'])
161
155
        source_stat = os.stat('source/file1')
162
156
        target_stat = os.stat('target/file1')
163
 
        same_file = (source_stat == target_stat)
164
 
        if same_file:
165
 
            pass
166
 
        else:
167
 
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
168
 
            self.assertContainsRe(err, "hardlinking working copy files is "
169
 
                "not currently supported")
170
 
            raise KnownFailure("--hardlink doesn't work in formats "
171
 
                "that support content filtering (#408193)")
 
157
        self.assertEqual(source_stat, target_stat)