← 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: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
22
22
from bzrlib import (
23
23
    branch,
24
24
    bzrdir,
 
25
    controldir,
25
26
    errors,
26
27
    osutils,
27
28
    tests,
35
36
    blackbox,
36
37
    http_server,
37
38
    scenarios,
 
39
    script,
38
40
    test_foreign,
39
41
    test_server,
40
42
    )
173
175
 
174
176
        def make_shared_tree(path):
175
177
            shared_repo.bzrdir.root_transport.mkdir(path)
176
 
            shared_repo.bzrdir.create_branch_convenience('repo/' + path)
 
178
            controldir.ControlDir.create_branch_convenience('repo/' + path)
177
179
            return workingtree.WorkingTree.open('repo/' + path)
178
180
        tree_a = make_shared_tree('a')
179
181
        self.build_tree(['repo/a/file'])
842
844
        self.assertEquals("", output)
843
845
        self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
844
846
            " push to dummy. You may want to use dpush instead.\n")
 
847
 
 
848
 
 
849
class TestPushOutput(script.TestCaseWithTransportAndScript):
 
850
 
 
851
    def test_push_log_format(self):
 
852
        self.run_script("""
 
853
            $ bzr init trunk
 
854
            Created a standalone tree (format: 2a)
 
855
            $ cd trunk
 
856
            $ echo foo > file
 
857
            $ bzr add
 
858
            adding file
 
859
            $ bzr commit -m 'we need some foo'
 
860
            2>Committing to:...trunk/
 
861
            2>added file
 
862
            2>Committed revision 1.
 
863
            $ bzr init ../feature
 
864
            Created a standalone tree (format: 2a)
 
865
            $ bzr push -v ../feature -Olog_format=line
 
866
            Added Revisions:
 
867
            1: jrandom@example.com ...we need some foo
 
868
            2>All changes applied successfully.
 
869
            2>Pushed up to revision 1.
 
870
            """)