/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_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-03-23 12:56:39 UTC
  • Revision ID: jelmer@samba.org-20120323125639-z3qgalx8qodxr2zw
bzr-handle-patch: Use spaces rather than tabs for indentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
1
 
# Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 John Arbash Meinel <john@arbash-meinel.com>
 
1
# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>
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
1185
1185
            'post_uncommit', commitmsgs.save_commit_messages, None)
1186
1186
 
1187
1187
    def _get_file_info_dict(self, rank):
1188
 
        file_info = [dict(path='a', file_id='a-id',
1189
 
                          message='a {msg} %d' % rank),
1190
 
                     dict(path='b', file_id='b-id',
1191
 
                          message='b msg %d' % rank)]
 
1188
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
 
1189
                     dict(path='b', file_id='b-id', message='b msg %d' % rank)]
1192
1190
        return file_info
1193
1191
 
1194
1192
    def _get_file_info_revprops(self, rank):
1196
1194
        return {'file-info': bencode.bencode(file_info_prop).decode('UTF-8')}
1197
1195
 
1198
1196
    def _get_commit_message(self):
1199
 
        return self.config.get_user_option(
1200
 
            'gtk_global_commit_message', expand=False)
 
1197
        return self.config.get_user_option('gtk_global_commit_message')
1201
1198
 
1202
1199
    def _get_file_commit_messages(self):
1203
 
        return self.config.get_user_option(
1204
 
            'gtk_file_commit_messages', expand=False)
 
1200
        return self.config.get_user_option('gtk_file_commit_messages')
1205
1201
 
1206
1202
 
1207
1203
class TestUncommitHook(TestSavedCommitMessages):
1223
1219
    def test_uncommit_one_by_one(self):
1224
1220
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1225
1221
        self.assertEquals(u'three', self._get_commit_message())
1226
 
        self.assertEquals(u'd4:a-id9:a {msg} 34:b-id7:b msg 3e',
 
1222
        self.assertEquals(u'd4:a-id7:a msg 34:b-id7:b msg 3e',
1227
1223
                          self._get_file_commit_messages())
1228
1224
 
1229
1225
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1230
1226
        self.assertEquals(u'two\n******\nthree', self._get_commit_message())
1231
 
        self.assertEquals(u'd4:a-id26:a {msg} 2\n******\na {msg} 3'
 
1227
        self.assertEquals(u'd4:a-id22:a msg 2\n******\na msg 3'
1232
1228
                          '4:b-id22:b msg 2\n******\nb msg 3e',
1233
1229
                          self._get_file_commit_messages())
1234
1230
 
1235
1231
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1236
1232
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1237
1233
                          self._get_commit_message())
1238
 
        self.assertEquals(
1239
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1240
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1241
 
            self._get_file_commit_messages())
 
1234
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1235
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1236
                          self._get_file_commit_messages())
1242
1237
 
1243
1238
    def test_uncommit_all_at_once(self):
1244
1239
        uncommit.uncommit(self.tree.branch, tree=self.tree, revno=1)
1245
1240
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1246
1241
                          self._get_commit_message())
1247
 
        self.assertEquals(
1248
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1249
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1250
 
            self._get_file_commit_messages())
 
1242
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1243
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1244
                          self._get_file_commit_messages())
1251
1245
 
1252
1246
 
1253
1247
class TestReusingSavedCommitMessages(TestSavedCommitMessages, QuestionHelpers):
1261
1255
        self.tree.add(['a'], ['a-id'])
1262
1256
        self.tree.add(['b'], ['b-id'])
1263
1257
        rev1 = self.tree.commit('one', revprops=self._get_file_info_revprops(1))
1264
 
        rev2 = self.tree.commit('two{x}',
1265
 
                                revprops=self._get_file_info_revprops(2))
 
1258
        rev2 = self.tree.commit('two', revprops=self._get_file_info_revprops(2))
1266
1259
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1267
1260
        self.build_tree_contents([('tree/a', 'new a content\n'),
1268
1261
                                  ('tree/b', 'new b content'),])
1277
1270
 
1278
1271
    def test_setup_saved_messages(self):
1279
1272
        # Check the initial setup
1280
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1281
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1273
        self.assertEquals(u'two', self._get_commit_message())
 
1274
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1282
1275
                          self._get_file_commit_messages())
1283
1276
 
1284
1277
    def test_messages_are_reloaded(self):
1285
1278
        dlg = self._get_commit_dialog(self.tree)
1286
 
        self.assertEquals(u'two{x}', dlg._get_global_commit_message())
 
1279
        self.assertEquals(u'two', dlg._get_global_commit_message())
1287
1280
        self.assertEquals(([u'a', u'b'],
1288
1281
                           [{ 'path': 'a',
1289
 
                             'file_id': 'a-id', 'message': 'a {msg} 2',},
 
1282
                             'file_id': 'a-id', 'message': 'a msg 2',},
1290
1283
                           {'path': 'b',
1291
1284
                            'file_id': 'b-id', 'message': 'b msg 2',}],),
1292
1285
                          dlg._get_specific_files())
1301
1294
        dlg = self._get_commit_dialog(self.tree)
1302
1295
        self._set_question_yes(dlg) # Save messages
1303
1296
        dlg._do_cancel()
1304
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1305
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1297
        self.assertEquals(u'two', self._get_commit_message())
 
1298
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1306
1299
                          self._get_file_commit_messages())
1307
1300
 
1308
1301
    def test_messages_are_cleared_on_cancel_if_required(self):