← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 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
28
28
    errors,
29
29
    workingtree,
30
30
    )
31
 
from bzrlib.tests.blackbox import ExternalBase
32
 
from bzrlib.tests import HardlinkFeature
33
 
 
34
 
 
35
 
class TestCheckout(ExternalBase):
 
31
from bzrlib.tests import (
 
32
    TestCaseWithTransport,
 
33
    )
 
34
from bzrlib.tests import (
 
35
    HardlinkFeature,
 
36
    KnownFailure,
 
37
    )
 
38
 
 
39
 
 
40
class TestCheckout(TestCaseWithTransport):
36
41
 
37
42
    def setUp(self):
38
43
        super(TestCheckout, self).setUp()
59
64
                         result.open_branch().bzrdir.root_transport.base)
60
65
 
61
66
    def test_checkout_dash_r(self):
62
 
        self.run_bzr('checkout -r -2 branch checkout')
 
67
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
63
68
        # the working tree should now be at revision '1' with the content
64
69
        # from 1.
65
70
        result = bzrdir.BzrDir.open('checkout')
67
72
        self.failIfExists('checkout/added_in_2')
68
73
 
69
74
    def test_checkout_light_dash_r(self):
70
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
75
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
 
76
            'branch', 'checkout'])
71
77
        # the working tree should now be at revision '1' with the content
72
78
        # from 1.
73
79
        result = bzrdir.BzrDir.open('checkout')
150
156
        self.build_tree(['source/file1'])
151
157
        source.add('file1')
152
158
        source.commit('added file')
153
 
        self.run_bzr(['checkout', 'source', 'target', '--files-from', 'source',
154
 
                      '--hardlink'])
 
159
        out, err = self.run_bzr('checkout source target --hardlink')
155
160
        source_stat = os.stat('source/file1')
156
161
        target_stat = os.stat('target/file1')
157
162
        self.assertEqual(source_stat, target_stat)
 
163
 
 
164
    def test_checkout_hardlink_files_from(self):
 
165
        self.requireFeature(HardlinkFeature)
 
166
        source = self.make_branch_and_tree('source')
 
167
        self.build_tree(['source/file1'])
 
168
        source.add('file1')
 
169
        source.commit('added file')
 
170
        source.bzrdir.sprout('second')
 
171
        out, err = self.run_bzr('checkout source target --hardlink'
 
172
                                ' --files-from second')
 
173
        second_stat = os.stat('second/file1')
 
174
        target_stat = os.stat('target/file1')
 
175
        self.assertEqual(second_stat, target_stat)