/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_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
171
171
        out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
172
172
        source_stat = os.stat('source/file1')
173
173
        target_stat = os.stat('target/file1')
174
 
        same_file = (source_stat == target_stat)
175
 
        if same_file:
176
 
            pass
177
 
        else:
178
 
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
179
 
            self.assertContainsRe(err, "hardlinking working copy files is "
180
 
                "not currently supported")
181
 
            raise KnownFailure("--hardlink doesn't work in formats "
182
 
                "that support content filtering (#408193)")
 
174
        self.assertEqual(source_stat, target_stat)
183
175
 
184
176
    def test_branch_standalone(self):
185
177
        shared_repo = self.make_repository('repo', shared=True)
217
209
        self.assertEqual('', out)
218
210
        self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
219
211
 
 
212
    def test_branch_bind(self):
 
213
        self.example_branch('a')
 
214
        out, err = self.run_bzr('branch a b --bind')
 
215
        self.assertEndsWith(err, "New branch bound to a\n")
 
216
        b = branch.Branch.open('b')
 
217
        self.assertEndsWith(b.get_bound_location(), '/a/')
 
218
 
220
219
 
221
220
class TestBranchStacked(ExternalBase):
222
221
    """Tests for branch --stacked"""