/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/tests/per_workingtree/test_commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-09-22 23:21:53 UTC
  • mfrom: (7391.3.3 less-id2path-1)
  • Revision ID: breezy.the.bot@gmail.com-20190922232153-z91h04dv1s1s1i6w
Use id2path in fewer places; instead use paths.

Merged from https://code.launchpad.net/~jelmer/brz/less-id2path-1/+merge/373061

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
214
214
    def test_commit_aborted_does_not_apply_automatic_changes_bug_282402(self):
215
215
        wt = self.make_branch_and_tree('.')
216
216
        wt.add(['a'], None, ['file'])
217
 
        a_id = wt.path2id('a')
218
 
        self.assertEqual('a', wt.id2path(a_id))
 
217
        self.assertTrue(wt.is_versioned('a'))
 
218
        if wt.supports_setting_file_ids():
 
219
            a_id = wt.path2id('a')
 
220
            self.assertEqual('a', wt.id2path(a_id))
219
221
 
220
222
        def fail_message(obj):
221
223
            raise errors.BzrCommandError("empty commit message")
222
224
        self.assertRaises(errors.BzrCommandError, wt.commit,
223
225
                          message_callback=fail_message)
224
 
        self.assertEqual('a', wt.id2path(a_id))
 
226
        self.assertTrue(wt.is_versioned('a'))
 
227
        if wt.supports_setting_file_ids():
 
228
            self.assertEqual('a', wt.id2path(a_id))
225
229
 
226
230
    def test_local_commit_ignores_master(self):
227
231
        # a --local commit does not require access to the master branch