/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_push.py

  • Committer: Curtis Hovey
  • Date: 2012-03-04 00:09:11 UTC
  • mto: This revision was merged to the branch mainline in revision 782.
  • Revision ID: sinzui.is@verizon.net-20120304000911-iaw196xcw4zfta9m
Added test to verify that DivergedBranches is handled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_push.py
45
45
        dialog = push.PushDialog(
46
46
            repository=None, revid=None, branch=branch, parent=None)
47
47
        self.assertIs(None, dialog.props.parent)
48
 
        self.assertIs(branch.repository, dialog.repository)
49
 
        self.assertIs(branch.last_revision(), dialog.revid)
 
48
        self.assertIs(None, dialog.repository)
 
49
        self.assertIs(None, dialog.revid)
50
50
        self.assertIs(branch, dialog.branch)
51
 
        # Layout rules to match HIG.
52
51
        self.assertIsInstance(dialog._label_location, Gtk.Label)
 
52
        self.assertEqual((0.0, 0.5), dialog._label_location.get_alignment())
53
53
        self.assertIsInstance(dialog._combo, Gtk.ComboBox)
54
54
        self.assertIsInstance(dialog._button_push, Gtk.Button)
55
55
        self.assertIsInstance(dialog._hbox_location, Gtk.Box)
 
56
        self.assertEqual(
 
57
            Gtk.Orientation.HORIZONTAL,
 
58
            dialog._hbox_location.props.orientation)
 
59
        self.assertEqual(3, dialog._hbox_location.props.spacing)
 
60
        self.assertEqual(3, dialog.get_content_area().props.spacing)
56
61
        self.assertIsInstance(dialog._progress_widget, ProgressPanel)
57
 
        self.assertIsInstance(dialog._push_message, Gtk.Label)
58
 
        self.assertIsInstance(dialog._history, UrlHistory)
59
62
        self.assertIs(
60
63
            ui.ui_factory._progress_bar_widget, dialog._progress_widget)
61
 
        self.assertEqual(
62
 
            Gtk.Orientation.HORIZONTAL,
63
 
            dialog._hbox_location.props.orientation)
64
 
        self.assertEqual(0.0, dialog._push_message.props.xalign)
65
 
        self.assertEqual(6, dialog.props.border_width)
66
 
        self.assertEqual(6, dialog._hbox_location.props.spacing)
67
 
        self.assertEqual(6, dialog.get_content_area().props.spacing)
68
 
        # Show rules.
 
64
        self.assertIsInstance(dialog._push_message, Gtk.Label)
69
65
        self.assertIs(True, dialog._combo.props.visible)
70
66
        self.assertIs(False, dialog._progress_widget.props.visible)
71
67
        self.assertIs(False, dialog._push_message.props.visible)
 
68
        self.assertIsInstance(dialog._history, UrlHistory)
72
69
 
73
70
    def test_build_history(self):
74
71
        set_ui_factory()
95
92
        self.assertIs(None, ui.ui_factory._progress_bar_widget)
96
93
 
97
94
    def test_on_push_clicked_without_errors(self):
98
 
        # Verify the dialog's and branch's final states after a push.
99
95
        MockMethod.bind(self, push, 'do_push', "test success")
100
96
        set_ui_factory()
101
97
        branch = self.make_push_branch()
117
113
        self.assertEqual('lp:~user/fnord/test', branch.get_push_location())
118
114
 
119
115
    def test_on_push_clicked_with_divered_branches(self):
120
 
        # Verify that when DivergedBranches is raise, the user can choose
121
 
        # to overwrite the branch.
122
116
        error = errors.DivergedBranches(None, None)
123
117
        MockMethod.bind(self, push, 'do_push', raise_error=error)
124
118
        MockMethod.bind(self, push, 'question_dialog', Gtk.ResponseType.YES)
133
127
            (branch, 'lp:~user/fnord/test'), push.do_push.args)
134
128
        self.assertEqual(
135
129
            {'overwrite': True}, push.do_push.kwargs)
136
 
 
137
 
 
138
 
class DoPushTestCase(tests.TestCaseWithTransport):
139
 
 
140
 
    def setup_ui(self):
141
 
        set_ui_factory()
142
 
        progress_panel = ProgressPanel()
143
 
        ui.ui_factory.set_progress_bar_widget(progress_panel)
144
 
        MockMethod.bind(self, progress_panel.pb, 'tick')
145
 
        MockMethod.bind(self, progress_panel.pb, 'update')
146
 
        MockMethod.bind(self, progress_panel.pb, 'finished')
147
 
        return progress_panel
148
 
 
149
 
    def make_from_branch(self):
150
 
        from_tree = self.make_branch_and_tree('this')
151
 
        self.build_tree(['this/a', 'this/b'])
152
 
        from_tree.add(['a', 'b'])
153
 
        from_tree.commit("msg")
154
 
        return from_tree.branch
155
 
 
156
 
    def test_do_push_without_dir(self):
157
 
        progress_panel = self.setup_ui()
158
 
        from_branch = self.make_from_branch()
159
 
        message = push.do_push(from_branch, 'that', False)
160
 
        self.assertEqual('1 revision(s) pushed.', message)
161
 
        self.assertEqual(True, progress_panel.pb.update.called)
162
 
        self.assertEqual(True, progress_panel.pb.finished.called)
163
 
 
164
 
    def test_do_push_without_parent_dir(self):
165
 
        progress_panel = self.setup_ui()
166
 
        from_branch = self.make_from_branch()
167
 
        MockMethod.bind(self, push, 'question_dialog', Gtk.ResponseType.OK)
168
 
        message = push.do_push(from_branch, 'that/there', False)
169
 
        self.assertEqual('1 revision(s) pushed.', message)
170
 
        self.assertEqual(True, push.question_dialog.called)
171
 
        self.assertEqual(True, progress_panel.pb.update.called)
172
 
        self.assertEqual(True, progress_panel.pb.finished.called)
173
 
 
174
 
    def test_do_push_without_parent_dir_aborted(self):
175
 
        self.setup_ui()
176
 
        from_branch = self.make_from_branch()
177
 
        MockMethod.bind(self, push, 'question_dialog', Gtk.ResponseType.CANCEL)
178
 
        message = push.do_push(from_branch, 'that/there', False)
179
 
        self.assertEqual('Push aborted.', message)
180
 
 
181
 
    def test_do_push_with_dir(self):
182
 
        progress_panel = self.setup_ui()
183
 
        self.make_branch_and_tree('that')
184
 
        from_branch = self.make_from_branch()
185
 
        message = push.do_push(from_branch, 'that', False)
186
 
        self.assertEqual('1 revision(s) pushed.', message)
187
 
        self.assertEqual(True, progress_panel.pb.update.called)
188
 
        self.assertEqual(True, progress_panel.pb.finished.called)
189
 
 
190
 
    def test_create_push_result_unstacked(self):
191
 
        from_branch = object()
192
 
        to_branch = self.make_branch_and_tree('that').branch
193
 
        push_result = push.create_push_result(from_branch, to_branch)
194
 
        self.assertIs(from_branch, push_result.source_branch)
195
 
        self.assertIs(to_branch, push_result.target_branch)
196
 
        self.assertIs(None, push_result.branch_push_result)
197
 
        self.assertIs(None, push_result.master_branch)
198
 
        self.assertEqual(0, push_result.old_revno)
199
 
        self.assertEqual(to_branch.last_revision(), push_result.old_revid)
200
 
        self.assertIs(None, push_result.workingtree_updated)
201
 
        self.assertIs(None, push_result.stacked_on)
202
 
 
203
 
    def test_create_push_result_stacked(self):
204
 
        from_branch = object()
205
 
        to_branch = self.make_branch_and_tree('that').branch
206
 
        MockMethod.bind(self, to_branch, 'get_stacked_on_url', 'lp:project')
207
 
        push_result = push.create_push_result(from_branch, to_branch)
208
 
        self.assertEqual('lp:project', push_result.stacked_on)
209
 
 
210
 
    def test_create_push_message_stacked_on(self):
211
 
        from_branch = object()
212
 
        to_branch = self.make_branch_and_tree('that').branch
213
 
        MockMethod.bind(self, to_branch, 'get_stacked_on_url', 'lp:project')
214
 
        push_result = push.create_push_result(from_branch, to_branch)
215
 
        from_branch = self.make_from_branch()
216
 
        message = push.create_push_message(from_branch, push_result)
217
 
        self.assertEqual(
218
 
            '1 revision(s) pushed.\nStacked on lp:project.', message)
219
 
 
220
 
    def test_create_push_message_workingtree_updated_false(self):
221
 
        from_branch = object()
222
 
        to_branch = self.make_branch_and_tree('that').branch
223
 
        push_result = push.create_push_result(from_branch, to_branch)
224
 
        push_result.workingtree_updated = False
225
 
        from_branch = self.make_from_branch()
226
 
        message = push.create_push_message(from_branch, push_result)
227
 
        self.assertEqual(
228
 
            "1 revision(s) pushed.\n\nThe working tree was not updated:\n"
229
 
            "See 'bzr help working-trees' for more information.",
230
 
            message)