← 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: 2009-12-03 00:17:53 UTC
  • mfrom: (4852.2.1 bzr-fix-publishing)
  • Revision ID: pqm@pqm.ubuntu.com-20091203001753-rrgwdoyxoojmn504
(David Roberts) Doc: delete unnecessary push of a checkout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
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
 
    )
 
34
from bzrlib.tests import http_server
39
35
from bzrlib.transport import memory
40
36
 
41
37
 
339
335
        # The push should have created target/a
340
336
        self.failUnlessExists('target/a')
341
337
 
342
 
    def test_push_use_existing_into_empty_bzrdir(self):
343
 
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
344
 
        fails.
345
 
        """
346
 
        tree = self.create_simple_tree()
347
 
        self.build_tree(['target/', 'target/.bzr/'])
348
 
        self.run_bzr_error(
349
 
            ['Target directory ../target already contains a .bzr directory, '
350
 
             'but it is not valid.'],
351
 
            'push ../target --use-existing-dir', working_dir='tree')
352
 
 
353
338
    def test_push_onto_repo(self):
354
339
        """We should be able to 'bzr push' into an existing bzrdir."""
355
340
        tree = self.create_simple_tree()
584
569
 
585
570
class RedirectingMemoryServer(memory.MemoryServer):
586
571
 
587
 
    def start_server(self):
 
572
    def setUp(self):
588
573
        self._dirs = {'/': None}
589
574
        self._files = {}
590
575
        self._locks = {}
598
583
        result._locks = self._locks
599
584
        return result
600
585
 
601
 
    def stop_server(self):
 
586
    def tearDown(self):
602
587
        transport.unregister_transport(self._scheme, self._memory_factory)
603
588
 
604
589
 
772
757
        self.set_config_push_strict('oFF')
773
758
        self.assertPushFails(['--strict'])
774
759
        self.assertPushSucceeds([])
775
 
 
776
 
 
777
 
class TestPushForeign(blackbox.ExternalBase):
778
 
 
779
 
    def setUp(self):
780
 
        super(TestPushForeign, self).setUp()
781
 
        test_foreign.register_dummy_foreign_for_test(self)
782
 
 
783
 
    def make_dummy_builder(self, relpath):
784
 
        builder = self.make_branch_builder(
785
 
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
786
 
        builder.build_snapshot('revid', None,
787
 
            [('add', ('', 'TREE_ROOT', 'directory', None)),
788
 
             ('add', ('foo', 'fooid', 'file', 'bar'))])
789
 
        return builder
790
 
 
791
 
    def test_no_roundtripping(self):
792
 
        target_branch = self.make_dummy_builder('dp').get_branch()
793
 
        source_tree = self.make_branch_and_tree("dc")
794
 
        output, error = self.run_bzr("push -d dc dp", retcode=3)
795
 
        self.assertEquals("", output)
796
 
        self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
797
 
            " push to dummy. You may want to use dpush instead.\n")