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

  • Committer: Andrew Bennetts
  • Date: 2009-10-15 02:19:43 UTC
  • mfrom: (4634.85.12 cleanup-hof)
  • mto: This revision was merged to the branch mainline in revision 4775.
  • Revision ID: andrew.bennetts@canonical.com-20091015021943-l8tuonz6q30tc4t6
Merge do_with_cleanups from cleanup-hof, and drop (or at least make private) everything else from that branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2008 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 (
35
 
    blackbox,
36
 
    http_server,
37
 
    test_foreign,
38
 
    test_server,
39
 
    )
 
34
from bzrlib.tests import http_server
40
35
from bzrlib.transport import memory
41
36
 
42
37
 
340
335
        # The push should have created target/a
341
336
        self.failUnlessExists('target/a')
342
337
 
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
 
 
354
338
    def test_push_onto_repo(self):
355
339
        """We should be able to 'bzr push' into an existing bzrdir."""
356
340
        tree = self.create_simple_tree()
585
569
 
586
570
class RedirectingMemoryServer(memory.MemoryServer):
587
571
 
588
 
    def start_server(self):
 
572
    def setUp(self):
589
573
        self._dirs = {'/': None}
590
574
        self._files = {}
591
575
        self._locks = {}
599
583
        result._locks = self._locks
600
584
        return result
601
585
 
602
 
    def stop_server(self):
 
586
    def tearDown(self):
603
587
        transport.unregister_transport(self._scheme, self._memory_factory)
604
588
 
605
589
 
661
645
    _default_wd = 'local'
662
646
    _default_errors = ['Working tree ".*/local/" has uncommitted '
663
647
                       'changes \(See bzr status\)\.',]
664
 
    _default_additional_error = 'Use --no-strict to force the push.\n'
665
 
    _default_additional_warning = 'Uncommitted changes will not be pushed.'
666
 
 
 
648
    _default_pushed_revid = 'modified'
667
649
 
668
650
    def assertPushFails(self, args):
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)
 
651
        self.run_bzr_error(self._default_errors, self._default_command + args,
 
652
                           working_dir=self._default_wd, retcode=3)
673
653
 
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())
 
654
    def assertPushSucceeds(self, args, pushed_revid=None):
 
655
        self.run_bzr(self._default_command + args,
 
656
                     working_dir=self._default_wd)
 
657
        if pushed_revid is None:
 
658
            pushed_revid = self._default_pushed_revid
 
659
        tree_to = workingtree.WorkingTree.open('to')
 
660
        repo_to = tree_to.branch.repository
 
661
        self.assertTrue(repo_to.has_revision(pushed_revid))
 
662
        self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
693
663
 
694
664
 
695
665
 
756
726
        self._default_wd = 'checkout'
757
727
        self._default_errors = ["Working tree is out of date, please run"
758
728
                                " 'bzr update'\.",]
 
729
        self._default_pushed_revid = 'modified-in-local'
759
730
 
760
731
    def test_push_default(self):
761
 
        self.assertPushSucceeds([], with_warning=True)
 
732
        self.assertPushFails([])
762
733
 
763
734
    def test_push_with_revision(self):
764
 
        self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
 
735
        self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
765
736
 
766
737
    def test_push_no_strict(self):
767
738
        self.assertPushSucceeds(['--no-strict'])
775
746
 
776
747
    def test_push_bogus_config_var_ignored(self):
777
748
        self.set_config_push_strict("I don't want you to be strict")
778
 
        self.assertPushSucceeds([], with_warning=True)
 
749
        self.assertPushFails([])
779
750
 
780
751
    def test_push_no_strict_command_line_override_config(self):
781
752
        self.set_config_push_strict('yES')
786
757
        self.set_config_push_strict('oFF')
787
758
        self.assertPushFails(['--strict'])
788
759
        self.assertPushSucceeds([])
789
 
 
790
 
 
791
 
class TestPushForeign(blackbox.ExternalBase):
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")