/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-16 00:39:04 UTC
  • mto: This revision was merged to the branch mainline in revision 6818.
  • Revision ID: jelmer@jelmer.uk-20171116003904-p6lcb827m6thxbzd
Migrate some build_snapshot code over to having revision_id as keyword argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/commitfromnews/tests/test_committemplate.py
65
65
        self.enable_commitfromnews()
66
66
        builder = self.make_branch_builder('test')
67
67
        builder.start_series()
68
 
        builder.build_snapshot('BASE-id', None,
 
68
        builder.build_snapshot(None,
69
69
            [('add', ('', None, 'directory', None)),
70
70
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
71
71
             ],
72
 
            message_callback=msgeditor.generate_commit_message_template)
 
72
            message_callback=msgeditor.generate_commit_message_template,
 
73
            revision_id='BASE-id')
73
74
        builder.finish_series()
74
75
        self.assertEqual([None], self.messages)
75
76
 
79
80
        builder = self.make_branch_builder('test')
80
81
        builder.start_series()
81
82
        content = INITIAL_NEWS_CONTENT
82
 
        builder.build_snapshot('BASE-id', None,
 
83
        builder.build_snapshot(None,
83
84
            [('add', ('', None, 'directory', None)),
84
85
             ('add', ('NEWS', 'foo-id', 'file', content)),
85
86
             ],
86
 
            message_callback=msgeditor.generate_commit_message_template)
 
87
            message_callback=msgeditor.generate_commit_message_template,
 
88
            revision_id='BASE-id')
87
89
        builder.finish_series()
88
90
        self.assertEqual([content], self.messages)
89
91
 
111
113
        change_content = """* Added a new change to the system.
112
114
 
113
115
"""
114
 
        builder.build_snapshot('BASE-id', None,
 
116
        builder.build_snapshot(None,
115
117
            [('add', ('', None, 'directory', None)),
116
118
             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
117
 
             ])
118
 
        builder.build_snapshot(None, None,
 
119
             ], revision_id='BASE-id')
 
120
        builder.build_snapshot(None,
119
121
            [('modify', ('foo-id', mod_content)),
120
122
             ],
121
123
            message_callback=msgeditor.generate_commit_message_template)
148
150
* Fixed a horrible bug. (lp:523423)
149
151
 
150
152
"""
151
 
        builder.build_snapshot('BASE-id', None,
 
153
        builder.build_snapshot(None,
152
154
            [('add', ('', None, 'directory', None)),
153
155
             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
154
 
             ])
155
 
        builder.build_snapshot(None, None,
 
156
             ], revision_id='BASE-id')
 
157
        builder.build_snapshot(None,
156
158
            [('modify', ('foo-id', mod_content)),
157
159
             ],
158
160
            message_callback=msgeditor.generate_commit_message_template)