← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-29 11:07:14 UTC
  • mfrom: (5813.1.1 realname-can-be-empty)
  • Revision ID: pqm@pqm.ubuntu.com-20110429110714-wr9f71ea9600lvb6
(jelmer) Allow realname to be empty in tests. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
23
23
    branch,
24
24
    bzrdir,
25
25
    errors,
26
 
    repository,
27
26
    revision as _mod_revision,
28
27
    )
29
28
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
30
29
from bzrlib.tests import TestCaseWithTransport
31
30
from bzrlib.tests import (
32
 
    KnownFailure,
 
31
    fixtures,
33
32
    HardlinkFeature,
34
33
    test_server,
35
34
    )
36
35
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 
36
from bzrlib.tests.script import run_script
37
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
38
38
from bzrlib.workingtree import WorkingTree
39
39
 
180
180
        source.add('file1')
181
181
        source.commit('added file')
182
182
        out, err = self.run_bzr('branch source target --files-from source')
183
 
        self.failUnlessExists('target/file1')
 
183
        self.assertPathExists('target/file1')
184
184
 
185
185
    def test_branch_files_from_hardlink(self):
186
186
        self.requireFeature(HardlinkFeature)
209
209
    def test_branch_no_tree(self):
210
210
        self.example_branch('source')
211
211
        self.run_bzr('branch --no-tree source target')
212
 
        self.failIfExists('target/hello')
213
 
        self.failIfExists('target/goodbye')
 
212
        self.assertPathDoesNotExist('target/hello')
 
213
        self.assertPathDoesNotExist('target/goodbye')
214
214
 
215
215
    def test_branch_into_existing_dir(self):
216
216
        self.example_branch('a')
226
226
        # force operation
227
227
        self.run_bzr('branch a b --use-existing-dir')
228
228
        # check conflicts
229
 
        self.failUnlessExists('b/hello.moved')
230
 
        self.failIfExists('b/godbye.moved')
 
229
        self.assertPathExists('b/hello.moved')
 
230
        self.assertPathDoesNotExist('b/godbye.moved')
231
231
        # we can't branch into branch
232
232
        out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
233
233
        self.assertEqual('', out)
270
270
        self.run_bzr('checkout --lightweight a b')
271
271
        self.assertLength(2, calls)
272
272
 
 
273
    def test_branch_fetches_all_tags(self):
 
274
        builder = self.make_branch_builder('source')
 
275
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
276
        source.tags.set_tag('tag-a', 'rev-2')
 
277
        # Now source has a tag not in its ancestry.  Make a branch from it.
 
278
        self.run_bzr('branch source new-branch')
 
279
        new_branch = branch.Branch.open('new-branch')
 
280
        # The tag is present, and so is its revision.
 
281
        self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))
 
282
        new_branch.repository.get_revision('rev-2')
 
283
 
273
284
 
274
285
class TestBranchStacked(TestCaseWithTransport):
275
286
    """Tests for branch --stacked"""
414
425
        # being too low. If rpc_count increases, more network roundtrips have
415
426
        # become necessary for this use case. Please do not adjust this number
416
427
        # upwards without agreement from bzr's network support maintainers.
417
 
        self.assertLength(37, self.hpss_calls)
 
428
        self.assertLength(36, self.hpss_calls)
418
429
 
419
430
    def test_branch_from_trivial_branch_streaming_acceptance(self):
420
431
        self.setup_smart_server_with_call_log()
451
462
        # upwards without agreement from bzr's network support maintainers.
452
463
        self.assertLength(14, self.hpss_calls)
453
464
 
 
465
    def test_branch_from_branch_with_tags(self):
 
466
        self.setup_smart_server_with_call_log()
 
467
        builder = self.make_branch_builder('source')
 
468
        source = fixtures.build_branch_with_non_ancestral_rev(builder)
 
469
        source.tags.set_tag('tag-a', 'rev-2')
 
470
        source.tags.set_tag('tag-missing', 'missing-rev')
 
471
        # Now source has a tag not in its ancestry.  Make a branch from it.
 
472
        self.reset_smart_call_log()
 
473
        out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])
 
474
        # This figure represent the amount of work to perform this use case. It
 
475
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
476
        # being too low. If rpc_count increases, more network roundtrips have
 
477
        # become necessary for this use case. Please do not adjust this number
 
478
        # upwards without agreement from bzr's network support maintainers.
 
479
        self.assertLength(9, self.hpss_calls)
 
480
 
454
481
 
455
482
class TestRemoteBranch(TestCaseWithSFTPServer):
456
483
 
475
502
        # Ensure that no working tree what created remotely
476
503
        self.assertFalse(t.has('remote/file'))
477
504
 
 
505
 
 
506
class TestDeprecatedAliases(TestCaseWithTransport):
 
507
 
 
508
    def test_deprecated_aliases(self):
 
509
        """bzr branch can be called clone or get, but those names are deprecated.
 
510
 
 
511
        See bug 506265.
 
512
        """
 
513
        for command in ['clone', 'get']:
 
514
            run_script(self, """
 
515
            $ bzr %(command)s A B
 
516
            2>The command 'bzr %(command)s' has been deprecated in bzr 2.4. Please use 'bzr branch' instead.
 
517
            2>bzr: ERROR: Not a branch...
 
518
            """ % locals())