← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
1
 
# Copyright (C) 2005, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006-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
31
31
    workingtree
32
32
    )
33
33
from bzrlib.repofmt import knitrepo
34
 
from bzrlib.tests import http_server
 
34
from bzrlib.tests import (
 
35
    blackbox,
 
36
    http_server,
 
37
    test_foreign,
 
38
    test_server,
 
39
    )
35
40
from bzrlib.transport import memory
36
41
 
37
42
 
253
258
        # upwards without agreement from bzr's network support maintainers.
254
259
        self.assertLength(11, self.hpss_calls)
255
260
 
 
261
    def test_push_smart_incremental_acceptance(self):
 
262
        self.setup_smart_server_with_call_log()
 
263
        t = self.make_branch_and_tree('from')
 
264
        rev_id1 = t.commit(allow_pointless=True, message='first commit')
 
265
        rev_id2 = t.commit(allow_pointless=True, message='second commit')
 
266
        self.run_bzr(
 
267
            ['push', self.get_url('to-one'), '-r1'], working_dir='from')
 
268
        self.reset_smart_call_log()
 
269
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
 
270
        # This figure represent the amount of work to perform this use case. It
 
271
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
272
        # being too low. If rpc_count increases, more network roundtrips have
 
273
        # become necessary for this use case. Please do not adjust this number
 
274
        # upwards without agreement from bzr's network support maintainers.
 
275
        self.assertLength(11, self.hpss_calls)
 
276
 
256
277
    def test_push_smart_with_default_stacking_url_path_segment(self):
257
278
        # If the default stacked-on location is a path element then branches
258
279
        # we push there over the smart server are stacked and their
319
340
        # The push should have created target/a
320
341
        self.failUnlessExists('target/a')
321
342
 
 
343
    def test_push_use_existing_into_empty_bzrdir(self):
 
344
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
 
345
        fails.
 
346
        """
 
347
        tree = self.create_simple_tree()
 
348
        self.build_tree(['target/', 'target/.bzr/'])
 
349
        self.run_bzr_error(
 
350
            ['Target directory ../target already contains a .bzr directory, '
 
351
             'but it is not valid.'],
 
352
            'push ../target --use-existing-dir', working_dir='tree')
 
353
 
322
354
    def test_push_onto_repo(self):
323
355
        """We should be able to 'bzr push' into an existing bzrdir."""
324
356
        tree = self.create_simple_tree()
553
585
 
554
586
class RedirectingMemoryServer(memory.MemoryServer):
555
587
 
556
 
    def setUp(self):
 
588
    def start_server(self):
557
589
        self._dirs = {'/': None}
558
590
        self._files = {}
559
591
        self._locks = {}
567
599
        result._locks = self._locks
568
600
        return result
569
601
 
570
 
    def tearDown(self):
 
602
    def stop_server(self):
571
603
        transport.unregister_transport(self._scheme, self._memory_factory)
572
604
 
573
605
 
576
608
    def setUp(self):
577
609
        tests.TestCaseWithTransport.setUp(self)
578
610
        self.memory_server = RedirectingMemoryServer()
579
 
        self.memory_server.setUp()
580
 
        self.addCleanup(self.memory_server.tearDown)
581
 
 
 
611
        self.start_server(self.memory_server)
582
612
        # Make the branch and tree that we'll be pushing.
583
613
        t = self.make_branch_and_tree('tree')
584
614
        self.build_tree(['tree/file'])
631
661
    _default_wd = 'local'
632
662
    _default_errors = ['Working tree ".*/local/" has uncommitted '
633
663
                       'changes \(See bzr status\)\.',]
634
 
    _default_pushed_revid = 'modified'
 
664
    _default_additional_error = 'Use --no-strict to force the push.\n'
 
665
    _default_additional_warning = 'Uncommitted changes will not be pushed.'
 
666
 
635
667
 
636
668
    def assertPushFails(self, args):
637
 
        self.run_bzr_error(self._default_errors, self._default_command + args,
638
 
                           working_dir=self._default_wd, retcode=3)
 
669
        out, err = self.run_bzr_error(self._default_errors,
 
670
                                      self._default_command + args,
 
671
                                      working_dir=self._default_wd, retcode=3)
 
672
        self.assertContainsRe(err, self._default_additional_error)
639
673
 
640
 
    def assertPushSucceeds(self, args, pushed_revid=None):
641
 
        self.run_bzr(self._default_command + args,
642
 
                     working_dir=self._default_wd)
643
 
        if pushed_revid is None:
644
 
            pushed_revid = self._default_pushed_revid
645
 
        tree_to = workingtree.WorkingTree.open('to')
646
 
        repo_to = tree_to.branch.repository
647
 
        self.assertTrue(repo_to.has_revision(pushed_revid))
648
 
        self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
 
674
    def assertPushSucceeds(self, args, with_warning=False, revid_to_push=None):
 
675
        if with_warning:
 
676
            error_regexes = self._default_errors
 
677
        else:
 
678
            error_regexes = []
 
679
        out, err = self.run_bzr(self._default_command + args,
 
680
                                working_dir=self._default_wd,
 
681
                                error_regexes=error_regexes)
 
682
        if with_warning:
 
683
            self.assertContainsRe(err, self._default_additional_warning)
 
684
        else:
 
685
            self.assertNotContainsRe(err, self._default_additional_warning)
 
686
        branch_from = branch.Branch.open(self._default_wd)
 
687
        if revid_to_push is None:
 
688
            revid_to_push = branch_from.last_revision()
 
689
        branch_to = branch.Branch.open('to')
 
690
        repo_to = branch_to.repository
 
691
        self.assertTrue(repo_to.has_revision(revid_to_push))
 
692
        self.assertEqual(revid_to_push, branch_to.last_revision())
649
693
 
650
694
 
651
695
 
681
725
 
682
726
    def setUp(self):
683
727
        super(TestPushStrictWithChanges, self).setUp()
 
728
        # Apply the changes defined in load_tests: one of _uncommitted_changes,
 
729
        # _pending_merges or _out_of_sync_trees
684
730
        getattr(self, self._changes_type)()
685
731
 
686
732
    def _uncommitted_changes(self):
710
756
        self._default_wd = 'checkout'
711
757
        self._default_errors = ["Working tree is out of date, please run"
712
758
                                " 'bzr update'\.",]
713
 
        self._default_pushed_revid = 'modified-in-local'
714
759
 
715
760
    def test_push_default(self):
716
 
        self.assertPushFails([])
 
761
        self.assertPushSucceeds([], with_warning=True)
717
762
 
718
763
    def test_push_with_revision(self):
719
 
        self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
 
764
        self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
720
765
 
721
766
    def test_push_no_strict(self):
722
767
        self.assertPushSucceeds(['--no-strict'])
730
775
 
731
776
    def test_push_bogus_config_var_ignored(self):
732
777
        self.set_config_push_strict("I don't want you to be strict")
733
 
        self.assertPushFails([])
 
778
        self.assertPushSucceeds([], with_warning=True)
734
779
 
735
780
    def test_push_no_strict_command_line_override_config(self):
736
781
        self.set_config_push_strict('yES')
741
786
        self.set_config_push_strict('oFF')
742
787
        self.assertPushFails(['--strict'])
743
788
        self.assertPushSucceeds([])
 
789
 
 
790
 
 
791
class TestPushForeign(tests.TestCaseWithTransport):
 
792
 
 
793
    def setUp(self):
 
794
        super(TestPushForeign, self).setUp()
 
795
        test_foreign.register_dummy_foreign_for_test(self)
 
796
 
 
797
    def make_dummy_builder(self, relpath):
 
798
        builder = self.make_branch_builder(
 
799
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
 
800
        builder.build_snapshot('revid', None,
 
801
            [('add', ('', 'TREE_ROOT', 'directory', None)),
 
802
             ('add', ('foo', 'fooid', 'file', 'bar'))])
 
803
        return builder
 
804
 
 
805
    def test_no_roundtripping(self):
 
806
        target_branch = self.make_dummy_builder('dp').get_branch()
 
807
        source_tree = self.make_branch_and_tree("dc")
 
808
        output, error = self.run_bzr("push -d dc dp", retcode=3)
 
809
        self.assertEquals("", output)
 
810
        self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
 
811
            " push to dummy. You may want to use dpush instead.\n")