← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
19
19
import os
20
20
from StringIO import StringIO
21
21
 
22
 
from bzrlib import merge_directive
23
 
from bzrlib.bundle import serializer
 
22
from bzrlib.bundle.serializer import read_bundle
24
23
from bzrlib.bzrdir import BzrDir
25
 
from bzrlib import tests
26
 
 
27
 
 
28
 
def read_bundle(fileobj):
29
 
    md = merge_directive.MergeDirective.from_lines(fileobj.readlines())
30
 
    return serializer.read_bundle(StringIO(md.get_raw_bundle()))
31
 
 
32
 
 
33
 
class TestSubmit(tests.TestCaseWithTransport):
 
24
from bzrlib.tests import TestCaseInTempDir
 
25
 
 
26
 
 
27
class TestBundle(TestCaseInTempDir):
34
28
 
35
29
    def make_trees(self):
36
30
        grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
45
39
        """Parent location is used as a basis by default"""
46
40
        self.make_trees()
47
41
        os.chdir('grandparent')
48
 
        errmsg = self.run_bzr('submit', retcode=3)[1]
49
 
        self.assertContainsRe(errmsg, 'No submit branch known or specified')
 
42
        errmsg = self.run_bzr('bundle', retcode=3)[1]
 
43
        self.assertContainsRe(errmsg, 'No base branch known or specified')
50
44
        os.chdir('../branch')
51
 
        stdout, stderr = self.run_bzr('submit')
 
45
        stdout, stderr = self.run_bzr('bundle')
52
46
        self.assertEqual(stderr.count('Using saved location'), 1)
53
47
        br = read_bundle(StringIO(stdout))
54
48
        self.assertRevisions(br, ['revision3'])
55
49
 
56
50
    def assertRevisions(self, bi, expected):
57
 
        self.assertEqual(set(r.revision_id for r in bi.revisions),
58
 
            set(expected))
 
51
        self.assertEqual([r.revision_id for r in bi.revisions], expected)
59
52
 
60
53
    def test_uses_submit(self):
61
54
        """Submit location can be used and set"""
62
 
        self.make_trees()
 
55
        self.make_trees()        
63
56
        os.chdir('branch')
64
 
        br = read_bundle(StringIO(self.run_bzr('submit')[0]))
 
57
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
65
58
        self.assertRevisions(br, ['revision3'])
66
 
        br = read_bundle(StringIO(self.run_bzr('submit ../grandparent')[0]))
 
59
        br = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
67
60
        self.assertRevisions(br, ['revision3', 'revision2'])
68
61
        # submit location should be auto-remembered
69
 
        br = read_bundle(StringIO(self.run_bzr('submit')[0]))
70
 
        self.assertRevisions(br, ['revision3', 'revision2'])
71
 
        self.run_bzr('submit ../parent')
72
 
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
73
 
        self.assertRevisions(br, ['revision3', 'revision2'])
74
 
        self.run_bzr('submit ../parent --remember')
 
62
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
 
63
        self.assertRevisions(br, ['revision3', 'revision2'])
 
64
        self.run_bzr('bundle', '../parent')
 
65
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
 
66
        self.assertRevisions(br, ['revision3', 'revision2'])
 
67
        self.run_bzr('bundle', '../parent', '--remember')
75
68
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
76
69
        self.assertRevisions(br, ['revision3'])
77
 
        err = self.run_bzr('submit --remember', retcode=3)[1]
 
70
        err = self.run_bzr('bundle', '--remember', retcode=3)[1]
78
71
        self.assertContainsRe(err, 
79
72
                              '--remember requires a branch to be specified.')
80
73
 
81
74
    def test_revision_branch_interaction(self):
82
 
        self.make_trees()
 
75
        self.make_trees()        
83
76
        os.chdir('branch')
84
 
        bi = read_bundle(StringIO(self.run_bzr('bundle ../grandparent')[0]))
 
77
        bi = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
85
78
        self.assertRevisions(bi, ['revision3', 'revision2'])
86
 
        out = StringIO(self.run_bzr('submit ../grandparent -r -2')[0])
 
79
        out = StringIO(self.run_bzr('bundle', '../grandparent', '-r', '-2')[0])
87
80
        bi = read_bundle(out)
88
81
        self.assertRevisions(bi, ['revision2'])
89
 
        sio = StringIO(self.run_bzr('submit -r -2..-1')[0])
90
 
        md = merge_directive.MergeDirective.from_lines(sio.readlines())
91
 
        self.assertEqual('revision2', md.base_revision_id)
92
 
        self.assertEqual('revision3', md.revision_id)
93
 
        sio.seek(0)
94
 
        bi = read_bundle(sio)
95
 
        self.assertRevisions(bi, ['revision2', 'revision3'])
96
 
        self.run_bzr('submit ../grandparent -r -2..-1')
 
82
        bi = read_bundle(StringIO(self.run_bzr('bundle', '-r', '-2..-1')[0]))
 
83
        self.assertRevisions(bi, ['revision3'])
 
84
        self.run_bzr('bundle', '../grandparent', '-r', '-2..-1', retcode=3)
97
85
 
98
86
    def test_output(self):
99
87
        # check output for consistency
100
88
        # win32 stdout converts LF to CRLF,
101
 
        # which would break patch-based bundles
 
89
        # and this is breaks the created bundle
102
90
        self.make_trees()        
103
91
        os.chdir('branch')
104
 
        stdout = self.run_bzr_subprocess('submit')[0]
 
92
        stdout = self.run_bzr_subprocess('bundle')[0]
105
93
        br = read_bundle(StringIO(stdout))
106
94
        self.assertRevisions(br, ['revision3'])
107
 
 
108
 
    def test_no_common_ancestor(self):
109
 
        foo = self.make_branch_and_tree('foo')
110
 
        foo.commit('rev a')
111
 
        bar = self.make_branch_and_tree('bar')
112
 
        bar.commit('rev b')
113
 
        os.chdir('foo')
114
 
        self.run_bzr('submit ../bar')
115
 
 
116
 
    def submit_directive(self, args):
117
 
        sio = StringIO(self.run_bzr(['submit'] + args)[0])
118
 
        return merge_directive.MergeDirective.from_lines(sio.readlines())
119
 
 
120
 
    def test_content_options(self):
121
 
        """--no-patch and --no-bundle should work and be independant"""
122
 
        self.make_trees()
123
 
        os.chdir('branch')
124
 
        md = self.submit_directive([])
125
 
        self.assertIsNot(None, md.bundle)
126
 
        self.assertIsNot(None, md.patch)
127
 
        md = self.submit_directive(['--no-patch'])
128
 
        self.assertIsNot(None, md.bundle)
129
 
        self.assertIs(None, md.patch)
130
 
        md = self.submit_directive(['--no-bundle', '.', '.'])
131
 
        self.assertIs(None, md.bundle)
132
 
        self.assertIsNot(None, md.patch)
133
 
        md = self.submit_directive(['--no-bundle', '--no-patch', '.', '.'])
134
 
        self.assertIs(None, md.bundle)
135
 
        self.assertIs(None, md.patch)
136
 
 
137
 
    def test_from_option(self):
138
 
        self.make_trees()
139
 
        self.run_bzr('submit', retcode=3)
140
 
        md = self.submit_directive(['--from', 'branch'])
141
 
        self.assertEqual('revision3', md.revision_id)
142
 
        md = self.submit_directive(['-f', 'branch'])
143
 
        self.assertEqual('revision3', md.revision_id)
144
 
 
145
 
    def test_output_option(self):
146
 
        self.make_trees()
147
 
        stdout = self.run_bzr('submit -f branch --output file1')[0]
148
 
        self.assertEqual('', stdout)
149
 
        md_file = open('file1', 'rb')
150
 
        self.addCleanup(md_file.close)
151
 
        self.assertContainsRe(md_file.read(), 'revision3')
152