← 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: Matt Nordhoff
  • Date: 2009-06-23 22:31:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4479.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623223159-fqfgl9c7a4umtafj
bzrlib.util.bencode's deprecation warning used the wrong stacklevel

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
1
 
# Copyright (C) 2006, 2007, 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
28
28
    errors,
29
29
    workingtree,
30
30
    )
31
 
from bzrlib.tests import (
32
 
    TestCaseWithTransport,
33
 
    )
34
 
from bzrlib.tests import (
35
 
    HardlinkFeature,
36
 
    KnownFailure,
37
 
    )
38
 
 
39
 
 
40
 
class TestCheckout(TestCaseWithTransport):
 
31
from bzrlib.tests.blackbox import ExternalBase
 
32
from bzrlib.tests import HardlinkFeature
 
33
 
 
34
 
 
35
class TestCheckout(ExternalBase):
41
36
 
42
37
    def setUp(self):
43
38
        super(TestCheckout, self).setUp()
64
59
                         result.open_branch().bzrdir.root_transport.base)
65
60
 
66
61
    def test_checkout_dash_r(self):
67
 
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
 
62
        self.run_bzr('checkout -r -2 branch checkout')
68
63
        # the working tree should now be at revision '1' with the content
69
64
        # from 1.
70
65
        result = bzrdir.BzrDir.open('checkout')
71
66
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
67
        self.failIfExists('checkout/added_in_2')
73
68
 
74
69
    def test_checkout_light_dash_r(self):
75
 
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
76
 
            'branch', 'checkout'])
 
70
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
77
71
        # the working tree should now be at revision '1' with the content
78
72
        # from 1.
79
73
        result = bzrdir.BzrDir.open('checkout')
80
74
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
75
        self.failIfExists('checkout/added_in_2')
82
76
 
83
77
    def test_checkout_reconstitutes_working_trees(self):
84
78
        # doing a 'bzr checkout' in the directory of a branch with no tree
124
118
            cmd.append('--lightweight')
125
119
        self.run_bzr('checkout source target')
126
120
        # files with unique content should be moved
127
 
        self.assertPathExists('target/file2.moved')
 
121
        self.failUnlessExists('target/file2.moved')
128
122
        # files with content matching tree should not be moved
129
 
        self.assertPathDoesNotExist('target/file1.moved')
 
123
        self.failIfExists('target/file1.moved')
130
124
 
131
125
    def test_checkout_existing_dir_heavy(self):
132
126
        self._test_checkout_existing_dir(False)
156
150
        self.build_tree(['source/file1'])
157
151
        source.add('file1')
158
152
        source.commit('added file')
159
 
        out, err = self.run_bzr('checkout source target --hardlink')
 
153
        self.run_bzr(['checkout', 'source', 'target', '--files-from', 'source',
 
154
                      '--hardlink'])
160
155
        source_stat = os.stat('source/file1')
161
156
        target_stat = os.stat('target/file1')
162
157
        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)