← 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: John Arbash Meinel
  • Date: 2009-07-30 23:54:26 UTC
  • mto: This revision was merged to the branch mainline in revision 4580.
  • Revision ID: john@arbash-meinel.com-20090730235426-o8h73swbh7seqaf7
Update the breakin support to support CTRL-BREAK on Windows.

The signal handling code is very similar, but the testing code got a bit clumsy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
1
 
# Copyright (C) 2009, 2010, 2011 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
18
18
"""Black-box tests for bzr dpush."""
19
19
 
20
20
 
21
 
from bzrlib import (
22
 
    tests,
23
 
    )
24
 
from bzrlib.tests import (
25
 
    script,
26
 
    test_foreign,
27
 
    )
28
 
from bzrlib.tests.blackbox import test_push
29
 
from bzrlib.tests.scenarios import (
30
 
    load_tests_apply_scenarios,
31
 
    )
32
 
 
33
 
 
34
 
load_tests = load_tests_apply_scenarios
35
 
 
36
 
 
37
 
class TestDpush(tests.TestCaseWithTransport):
 
21
import os
 
22
 
 
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):
38
47
 
39
48
    def setUp(self):
 
49
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
50
        InterBranch.register_optimiser(InterToDummyVcsBranch)
 
51
        self.addCleanup(self.unregister_format)
40
52
        super(TestDpush, self).setUp()
41
 
        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)
42
60
 
43
61
    def make_dummy_builder(self, relpath):
44
 
        builder = self.make_branch_builder(
45
 
            relpath, format=test_foreign.DummyForeignVcsDirFormat())
46
 
        builder.build_snapshot('revid', None,
 
62
        builder = self.make_branch_builder(relpath, 
 
63
                format=DummyForeignVcsDirFormat())
 
64
        builder.build_snapshot('revid', None, 
47
65
            [('add', ('', 'TREE_ROOT', 'directory', None)),
48
66
             ('add', ('foo', 'fooid', 'file', 'bar'))])
49
67
        return builder
53
71
        source_tree = self.make_branch_and_tree("dc")
54
72
        output, error = self.run_bzr("dpush -d dc dp", retcode=3)
55
73
        self.assertEquals("", output)
56
 
        self.assertContainsRe(error,
57
 
            'in the same VCS, lossy push not necessary. Please use regular '
58
 
            'push.')
 
74
        self.assertContainsRe(error, 'in the same VCS, lossy push not necessary. Please use regular push.')
59
75
 
60
76
    def test_dpush(self):
61
77
        branch = self.make_dummy_builder('d').get_branch()
64
80
        self.build_tree(("dc/foo", "blaaaa"))
65
81
        dc.open_workingtree().commit('msg')
66
82
 
67
 
        script.run_script(self, """
68
 
            $ bzr dpush -d dc d
69
 
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
70
 
            2>This may take some time. Upgrade the repositories to the same format for better performance.
71
 
            2>Pushed up to revision 2.
72
 
            $ bzr status dc
73
 
            """)
 
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")
74
86
 
75
87
    def test_dpush_new(self):
76
 
        b = self.make_dummy_builder('d').get_branch()
 
88
        branch = self.make_dummy_builder('d').get_branch()
77
89
 
78
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
90
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
79
91
        self.build_tree_contents([("dc/foofile", "blaaaa")])
80
92
        dc_tree = dc.open_workingtree()
81
93
        dc_tree.add("foofile")
82
94
        dc_tree.commit("msg")
83
95
 
84
 
        script.run_script(self, '''
85
 
            $ bzr dpush -d dc d
86
 
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
87
 
            2>This may take some time. Upgrade the repositories to the same format for better performance.
88
 
            2>Pushed up to revision 2.
89
 
            $ bzr revno dc
90
 
            2
91
 
            $ bzr status dc
92
 
            ''')
 
96
        self.check_output("", "dpush -d dc d")
 
97
        self.check_output("2\n", "revno dc")
 
98
        self.check_output("", "status dc")
93
99
 
94
100
    def test_dpush_wt_diff(self):
95
 
        b = self.make_dummy_builder('d').get_branch()
 
101
        branch = self.make_dummy_builder('d').get_branch()
96
102
 
97
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
103
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
98
104
        self.build_tree_contents([("dc/foofile", "blaaaa")])
99
105
        dc_tree = dc.open_workingtree()
100
106
        dc_tree.add("foofile")
101
107
        newrevid = dc_tree.commit('msg')
102
108
 
103
109
        self.build_tree_contents([("dc/foofile", "blaaaal")])
104
 
        script.run_script(self, '''
105
 
            $ bzr dpush -d dc d --no-strict
106
 
            2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
107
 
            2>This may take some time. Upgrade the repositories to the same format for better performance.
108
 
            2>Pushed up to revision 2.
109
 
            ''')
 
110
        self.check_output("", "dpush -d dc d")
110
111
        self.assertFileEqual("blaaaal", "dc/foofile")
111
 
        # if the dummy vcs wasn't that dummy we could uncomment the line below
112
 
        # self.assertFileEqual("blaaaa", "d/foofile")
113
 
        script.run_script(self, '''
114
 
            $ bzr status dc
115
 
            modified:
116
 
              foofile
117
 
            ''')
 
112
        self.check_output('modified:\n  foofile\n', "status dc")
118
113
 
119
114
    def test_diverged(self):
120
115
        builder = self.make_dummy_builder('d')
121
116
 
122
 
        b = builder.get_branch()
 
117
        branch = builder.get_branch()
123
118
 
124
 
        dc = b.bzrdir.sprout('dc', force_new_repo=True)
 
119
        dc = branch.bzrdir.sprout('dc', force_new_repo=True)
125
120
        dc_tree = dc.open_workingtree()
126
121
 
127
122
        self.build_tree_contents([("dc/foo", "bar")])
133
128
        output, error = self.run_bzr("dpush -d dc d", retcode=3)
134
129
        self.assertEquals(output, "")
135
130
        self.assertContainsRe(error, "have diverged")
136
 
 
137
 
 
138
 
class TestDpushStrictMixin(object):
139
 
 
140
 
    def setUp(self):
141
 
        test_foreign.register_dummy_foreign_for_test(self)
142
 
        # Create an empty branch where we will be able to push
143
 
        self.foreign = self.make_branch(
144
 
            'to', format=test_foreign.DummyForeignVcsDirFormat())
145
 
 
146
 
    def set_config_push_strict(self, value):
147
 
        # set config var (any of bazaar.conf, locations.conf, branch.conf
148
 
        # should do)
149
 
        conf = self.tree.branch.get_config()
150
 
        conf.set_user_option('dpush_strict', value)
151
 
 
152
 
    _default_command = ['dpush', '../to']
153
 
 
154
 
 
155
 
class TestDpushStrictWithoutChanges(TestDpushStrictMixin,
156
 
                                    test_push.TestPushStrictWithoutChanges):
157
 
 
158
 
    def setUp(self):
159
 
        test_push.TestPushStrictWithoutChanges.setUp(self)
160
 
        TestDpushStrictMixin.setUp(self)
161
 
 
162
 
 
163
 
class TestDpushStrictWithChanges(TestDpushStrictMixin,
164
 
                                 test_push.TestPushStrictWithChanges):
165
 
 
166
 
    scenarios = test_push.strict_push_change_scenarios
167
 
 
168
 
    _changes_type = None # Set by load_tests
169
 
 
170
 
    def setUp(self):
171
 
        test_push.TestPushStrictWithChanges.setUp(self)
172
 
        TestDpushStrictMixin.setUp(self)
173
 
 
174
 
    def test_push_with_revision(self):
175
 
        raise tests.TestNotApplicable('dpush does not handle --revision')