← Back to branch summary

~jelmer/brz/tree-reference-fixes

« back to all changes in this revision

Viewing changes to breezy/plugins/commitfromnews/tests/test_committemplate.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6926.1.2 work)
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/commitfromnews/tests/test_committemplate.py
67
67
        builder.start_series()
68
68
        builder.build_snapshot(None,
69
69
            [('add', ('', None, 'directory', None)),
70
 
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
 
70
             ('add', ('foo', b'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
71
71
             ],
72
72
            message_callback=msgeditor.generate_commit_message_template,
73
 
            revision_id='BASE-id')
 
73
            revision_id=b'BASE-id')
74
74
        builder.finish_series()
75
75
        self.assertEqual([None], self.messages)
76
76
 
82
82
        content = INITIAL_NEWS_CONTENT
83
83
        builder.build_snapshot(None,
84
84
            [('add', ('', None, 'directory', None)),
85
 
             ('add', ('NEWS', 'foo-id', 'file', content)),
 
85
             ('add', ('NEWS', b'foo-id', 'file', content)),
86
86
             ],
87
87
            message_callback=msgeditor.generate_commit_message_template,
88
 
            revision_id='BASE-id')
 
88
            revision_id=b'BASE-id')
89
89
        builder.finish_series()
90
90
        self.assertEqual([content], self.messages)
91
91
 
115
115
"""
116
116
        builder.build_snapshot(None,
117
117
            [('add', ('', None, 'directory', None)),
118
 
             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
119
 
             ], revision_id='BASE-id')
 
118
             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
 
119
             ], revision_id=b'BASE-id')
120
120
        builder.build_snapshot(None,
121
 
            [('modify', ('foo-id', mod_content)),
 
121
            [('modify', (b'foo-id', mod_content)),
122
122
             ],
123
123
            message_callback=msgeditor.generate_commit_message_template)
124
124
        builder.finish_series()
152
152
"""
153
153
        builder.build_snapshot(None,
154
154
            [('add', ('', None, 'directory', None)),
155
 
             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
156
 
             ], revision_id='BASE-id')
 
155
             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
 
156
             ], revision_id=b'BASE-id')
157
157
        builder.build_snapshot(None,
158
 
            [('modify', ('foo-id', mod_content)),
 
158
            [('modify', (b'foo-id', mod_content)),
159
159
             ],
160
160
            message_callback=msgeditor.generate_commit_message_template)
161
161
        builder.finish_series()