← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2008, 2009 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
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib import (
24
 
    branch,
25
 
    bzrdir,
26
 
    foreign,
27
 
    tests,
28
 
    workingtree,
29
 
    )
30
 
from bzrlib.tests import (
31
 
    blackbox,
32
 
    script,
33
 
    test_foreign,
34
 
    )
35
 
from bzrlib.tests.blackbox import test_push
36
 
 
37
 
 
38
 
def load_tests(standard_tests, module, loader):
39
 
    """Multiply tests for the dpush command."""
40
 
    result = loader.suiteClass()
41
 
 
42
 
    # one for each king of change
43
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
44
 
        standard_tests, tests.condition_isinstance((
45
 
                TestDpushStrictWithChanges,
46
 
                )))
47
 
    changes_scenarios = [
48
 
        ('uncommitted',
49
 
         dict(_changes_type= '_uncommitted_changes')),
50
 
        ('pending-merges',
51
 
         dict(_changes_type= '_pending_merges')),
52
 
        ('out-of-sync-trees',
53
 
         dict(_changes_type= '_out_of_sync_trees')),
54
 
        ]
55
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
56
 
    # No parametrization for the remaining tests
57
 
    result.addTests(remaining_tests)
58
 
 
59
 
    return result
60
 
 
61
 
 
62
 
class TestDpush(tests.TestCaseWithTransport):
 
23
from bzrlib.branch import (
 
24
    Branch,
 
25
    InterBranch,
 
26
    )
 
27
from bzrlib.bzrdir import (
 
28
    BzrDirFormat,
 
29
    )
 
30
from bzrlib.foreign import (
 
31
    ForeignBranch,
 
32
    ForeignRepository,
 
33
    )
 
34
from bzrlib.repository import (
 
35
    Repository,
 
36
    )
 
37
from bzrlib.tests.blackbox import (
 
38
    ExternalBase,
 
39
    )
 
40
from bzrlib.tests.test_foreign import (
 
41
    DummyForeignVcsDirFormat,
 
42
    InterToDummyVcsBranch,
 
43
    )
 
44
 
 
45
 
 
46
class TestDpush(ExternalBase):
63
47
 
64
48
    def setUp(self):
 
49
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
50
        InterBranch.register_optimiser(InterToDummyVcsBranch)
 
51
        self.addCleanup(self.unregister_format)
65
52
        super(TestDpush, self).setUp()
66
 
        test_foreign.register_dummy_foreign_for_test(self)
 
53
 
 
54
    def unregister_format(self):
 
55
        try:
 
56
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
57
        except ValueError:
 
58
            pass
 
59
        InterBranch.unregister_optimiser(InterToDummyVcsBranch)
67
60
 
68
61
    def make_dummy_builder(self, relpath):
69
 
        builder = self.make_branch_builder(
70
 
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
71
 
        builder.build_snapshot('revid', None,
 
62
        builder = self.make_branch_builder(relpath, 
 
63
                format=DummyForeignVcsDirFormat())
 
64
        builder.build_snapshot('revid', None, 
72
65
            [('add', ('', 'TREE_ROOT', 'directory', None)),
73
66
             ('add', ('foo', 'fooid', 'file', 'bar'))])
74
67
        return builder
87
80
        self.build_tree(("dc/foo", "blaaaa"))
88
81
        dc.open_workingtree().commit('msg')
89
82
 
90
 
        script.run_script(self, """
91
 
            $ bzr dpush -d dc d
92
 
            2>Pushed up to revision 2.
93
 
            $ bzr status dc
94
 
            """)
 
83
        output, error = self.run_bzr("dpush -d dc d")
 
84
        self.assertEquals(error, "Pushed up to revision 2.\n")
 
85
        self.check_output("", "status dc")
95
86
 
96
87
    def test_dpush_new(self):
97
 
        b = self.make_dummy_builder('d').get_branch()
 
88
        branch = self.make_dummy_builder('d').get_branch()
98
89
 
99
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
90
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
100
91
        self.build_tree_contents([("dc/foofile", "blaaaa")])
101
92
        dc_tree = dc.open_workingtree()
102
93
        dc_tree.add("foofile")
103
94
        dc_tree.commit("msg")
104
95
 
105
 
        script.run_script(self, '''
106
 
            $ bzr dpush -d dc d
107
 
            $ bzr revno dc
108
 
            2
109
 
            $ bzr status dc
110
 
            ''')
 
96
        self.check_output("", "dpush -d dc d")
 
97
        self.check_output("2\n", "revno dc")
 
98
        self.check_output("", "status dc")
111
99
 
112
100
    def test_dpush_wt_diff(self):
113
 
        b = self.make_dummy_builder('d').get_branch()
 
101
        branch = self.make_dummy_builder('d').get_branch()
114
102
 
115
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
103
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
116
104
        self.build_tree_contents([("dc/foofile", "blaaaa")])
117
105
        dc_tree = dc.open_workingtree()
118
106
        dc_tree.add("foofile")
119
107
        newrevid = dc_tree.commit('msg')
120
108
 
121
109
        self.build_tree_contents([("dc/foofile", "blaaaal")])
122
 
        script.run_script(self, '''
123
 
            $ bzr dpush -d dc d --no-strict
124
 
            ''')
 
110
        self.check_output("", "dpush -d dc d")
125
111
        self.assertFileEqual("blaaaal", "dc/foofile")
126
 
        # if the dummy vcs wasn't that dummy we could uncomment the line below
127
 
        # self.assertFileEqual("blaaaa", "d/foofile")
128
 
        script.run_script(self, '''
129
 
            $ bzr status dc
130
 
            modified:
131
 
              foofile
132
 
            ''')
 
112
        self.check_output('modified:\n  foofile\n', "status dc")
133
113
 
134
114
    def test_diverged(self):
135
115
        builder = self.make_dummy_builder('d')
136
116
 
137
 
        b = builder.get_branch()
 
117
        branch = builder.get_branch()
138
118
 
139
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
119
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
140
120
        dc_tree = dc.open_workingtree()
141
121
 
142
122
        self.build_tree_contents([("dc/foo", "bar")])
148
128
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
149
129
        self.assertEquals(output, "")
150
130
        self.assertContainsRe(error, "have diverged")
151
 
 
152
 
 
153
 
class TestDpushStrictMixin(object):
154
 
 
155
 
    def setUp(self):
156
 
        test_foreign.register_dummy_foreign_for_test(self)
157
 
        # Create an empty branch where we will be able to push
158
 
        self.foreign = self.make_branch(
159
 
            'to', format=test_foreign.DummyForeignVcsDirFormat())
160
 
 
161
 
    def set_config_push_strict(self, value):
162
 
        # set config var (any of bazaar.conf, locations.conf, branch.conf
163
 
        # should do)
164
 
        conf = self.tree.branch.get_config()
165
 
        conf.set_user_option('dpush_strict', value)
166
 
 
167
 
    _default_command = ['dpush', '../to']
168
 
 
169
 
 
170
 
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
171
 
                                    test_push.TestPushStrictWithoutChanges):
172
 
 
173
 
    def setUp(self):
174
 
        test_push.TestPushStrictWithoutChanges.setUp(self)
175
 
        TestDpushStrictMixin.setUp(self)
176
 
 
177
 
 
178
 
class TestDpushStrictWithChanges(TestDpushStrictMixin,
179
 
                                 test_push.TestPushStrictWithChanges):
180
 
 
181
 
    _changes_type = None # Set by load_tests
182
 
 
183
 
    def setUp(self):
184
 
        test_push.TestPushStrictWithChanges.setUp(self)
185
 
        TestDpushStrictMixin.setUp(self)
186
 
 
187
 
    def test_push_with_revision(self):
188
 
        raise tests.TestNotApplicable('dpush does not handle --revision')
189