← 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: Gary van der Merwe
  • Date: 2010-08-02 19:56:52 UTC
  • mfrom: (5050.3.18 2.2)
  • mto: (5050.3.19 2.2)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/2.2.

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')
72
72
        self.failIfExists('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')
160
161
            '--hardlink'])
161
162
        source_stat = os.stat('source/file1')
162
163
        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)")
 
164
        self.assertEqual(source_stat, target_stat)