/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-20 08:02:26 UTC
  • mfrom: (4584.3.32 apport)
  • Revision ID: pqm@pqm.ubuntu.com-20090820080226-97krol4wohcyh2ba
(mbp) re-add apport support

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, 2009 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
64
64
                         result.open_branch().bzrdir.root_transport.base)
65
65
 
66
66
    def test_checkout_dash_r(self):
67
 
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
 
        self.assertContainsRe(out, 'Copying history to "checkout".')
 
67
        self.run_bzr('checkout -r -2 branch checkout')
69
68
        # the working tree should now be at revision '1' with the content
70
69
        # from 1.
71
70
        result = bzrdir.BzrDir.open('checkout')
73
72
        self.failIfExists('checkout/added_in_2')
74
73
 
75
74
    def test_checkout_light_dash_r(self):
76
 
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
77
 
            'branch', 'checkout'])
78
 
        self.assertNotContainsRe(out, 'Copying history')
 
75
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
79
76
        # the working tree should now be at revision '1' with the content
80
77
        # from 1.
81
78
        result = bzrdir.BzrDir.open('checkout')
163
160
            '--hardlink'])
164
161
        source_stat = os.stat('source/file1')
165
162
        target_stat = os.stat('target/file1')
166
 
        self.assertEqual(source_stat, target_stat)
 
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)")