/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

Commit messages never contain config options

Show diffs side-by-side

added added

removed removed

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