/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: Canonical.com Patch Queue Manager
  • Date: 2009-07-02 11:37:38 UTC
  • mfrom: (4496.3.16 pyflakes-nits)
  • Revision ID: pqm@pqm.ubuntu.com-20090702113738-5qda6d3y80z4l3o5
(andrew) Fix some trivial bugs and unused/redundant imports reported
        by pyflakes.

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
 
244
239
        remote = branch.Branch.open('public')
245
240
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
246
241
 
247
 
    def test_push_smart_tags_streaming_acceptance(self):
248
 
        self.setup_smart_server_with_call_log()
249
 
        t = self.make_branch_and_tree('from')
250
 
        rev_id = t.commit(allow_pointless=True, message='first commit')
251
 
        t.branch.tags.set_tag('new-tag', rev_id)
252
 
        self.reset_smart_call_log()
253
 
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
254
 
        # This figure represent the amount of work to perform this use case. It
255
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
256
 
        # being too low. If rpc_count increases, more network roundtrips have
257
 
        # become necessary for this use case. Please do not adjust this number
258
 
        # upwards without agreement from bzr's network support maintainers.
259
 
        self.assertLength(11, self.hpss_calls)
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
 
 
277
242
    def test_push_smart_with_default_stacking_url_path_segment(self):
278
243
        # If the default stacked-on location is a path element then branches
279
244
        # we push there over the smart server are stacked and their
340
305
        # The push should have created target/a
341
306
        self.failUnlessExists('target/a')
342
307
 
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
308
    def test_push_onto_repo(self):
355
309
        """We should be able to 'bzr push' into an existing bzrdir."""
356
310
        tree = self.create_simple_tree()
558
512
class RedirectingMemoryTransport(memory.MemoryTransport):
559
513
 
560
514
    def mkdir(self, relpath, mode=None):
 
515
        from bzrlib.trace import mutter
561
516
        if self._cwd == '/source/':
562
517
            raise errors.RedirectRequested(self.abspath(relpath),
563
518
                                           self.abspath('../target'),
570
525
            return super(RedirectingMemoryTransport, self).mkdir(
571
526
                relpath, mode)
572
527
 
573
 
    def get(self, relpath):
574
 
        if self.clone(relpath)._cwd == '/infinite-loop/':
575
 
            raise errors.RedirectRequested(self.abspath(relpath),
576
 
                                           self.abspath('../infinite-loop'),
577
 
                                           is_permanent=True)
578
 
        else:
579
 
            return super(RedirectingMemoryTransport, self).get(relpath)
580
 
 
581
528
    def _redirected_to(self, source, target):
582
529
        # We do accept redirections
583
530
        return transport.get_transport(target)
585
532
 
586
533
class RedirectingMemoryServer(memory.MemoryServer):
587
534
 
588
 
    def start_server(self):
 
535
    def setUp(self):
589
536
        self._dirs = {'/': None}
590
537
        self._files = {}
591
538
        self._locks = {}
599
546
        result._locks = self._locks
600
547
        return result
601
548
 
602
 
    def stop_server(self):
 
549
    def tearDown(self):
603
550
        transport.unregister_transport(self._scheme, self._memory_factory)
604
551
 
605
552
 
608
555
    def setUp(self):
609
556
        tests.TestCaseWithTransport.setUp(self)
610
557
        self.memory_server = RedirectingMemoryServer()
611
 
        self.start_server(self.memory_server)
 
558
        self.memory_server.setUp()
 
559
        self.addCleanup(self.memory_server.tearDown)
 
560
 
612
561
        # Make the branch and tree that we'll be pushing.
613
562
        t = self.make_branch_and_tree('tree')
614
563
        self.build_tree(['tree/file'])
661
610
    _default_wd = 'local'
662
611
    _default_errors = ['Working tree ".*/local/" has uncommitted '
663
612
                       '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
 
 
 
613
    _default_pushed_revid = 'modified'
667
614
 
668
615
    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)
 
616
        self.run_bzr_error(self._default_errors, self._default_command + args,
 
617
                           working_dir=self._default_wd, retcode=3)
673
618
 
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())
 
619
    def assertPushSucceeds(self, args, pushed_revid=None):
 
620
        self.run_bzr(self._default_command + args,
 
621
                     working_dir=self._default_wd)
 
622
        if pushed_revid is None:
 
623
            pushed_revid = self._default_pushed_revid
 
624
        tree_to = workingtree.WorkingTree.open('to')
 
625
        repo_to = tree_to.branch.repository
 
626
        self.assertTrue(repo_to.has_revision(pushed_revid))
 
627
        self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
693
628
 
694
629
 
695
630
 
725
660
 
726
661
    def setUp(self):
727
662
        super(TestPushStrictWithChanges, self).setUp()
728
 
        # Apply the changes defined in load_tests: one of _uncommitted_changes,
729
 
        # _pending_merges or _out_of_sync_trees
730
663
        getattr(self, self._changes_type)()
731
664
 
732
665
    def _uncommitted_changes(self):
756
689
        self._default_wd = 'checkout'
757
690
        self._default_errors = ["Working tree is out of date, please run"
758
691
                                " 'bzr update'\.",]
 
692
        self._default_pushed_revid = 'modified-in-local'
759
693
 
760
694
    def test_push_default(self):
761
 
        self.assertPushSucceeds([], with_warning=True)
 
695
        self.assertPushFails([])
762
696
 
763
697
    def test_push_with_revision(self):
764
 
        self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
 
698
        self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
765
699
 
766
700
    def test_push_no_strict(self):
767
701
        self.assertPushSucceeds(['--no-strict'])
775
709
 
776
710
    def test_push_bogus_config_var_ignored(self):
777
711
        self.set_config_push_strict("I don't want you to be strict")
778
 
        self.assertPushSucceeds([], with_warning=True)
 
712
        self.assertPushFails([])
779
713
 
780
714
    def test_push_no_strict_command_line_override_config(self):
781
715
        self.set_config_push_strict('yES')
786
720
        self.set_config_push_strict('oFF')
787
721
        self.assertPushFails(['--strict'])
788
722
        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")