← 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: INADA Naoki
  • Date: 2011-05-05 09:15:34 UTC
  • mto: (5830.3.3 i18n-msgfmt)
  • mto: This revision was merged to the branch mainline in revision 5873.
  • Revision ID: songofacandy@gmail.com-20110505091534-7sv835xpofwrmpt4
Add update-pot command to Makefile and tools/bzrgettext script that
extracts help text from bzr commands.

Show diffs side-by-side

added added

removed removed

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