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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
312
312
        conflicts = builder.merge(self.merge_type)
313
313
        self.assertEqual(conflicts, [])
314
314
        self.assertEqual(
315
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
315
            builder.this.get_file('name1').read(), 'text-merged-by-hook')
316
316
 
317
317
    def test_change_vs_deleted(self):
318
318
        """Hook is used for (changed, deleted)"""
324
324
        conflicts = builder.merge(self.merge_type)
325
325
        self.assertEqual(conflicts, [])
326
326
        self.assertEqual(
327
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
327
            builder.this.get_file('name1').read(), 'text-merged-by-hook')
328
328
 
329
329
    def test_result_can_be_delete(self):
330
330
        """A hook's result can be the deletion of a file."""
346
346
        # The hook still gets to set the file contents in this case, so that it
347
347
        # can insert custom conflict markers.
348
348
        self.assertEqual(
349
 
            builder.this.get_file('1').read(),
 
349
            builder.this.get_file('name1').read(),
350
350
            'text-with-conflict-markers-from-hook')
351
351
 
352
352
    def test_can_access_this_other_and_base_versions(self):
370
370
        conflicts = builder.merge(self.merge_type)
371
371
        self.assertEqual(conflicts, [])
372
372
        self.assertEqual(
373
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
373
            builder.this.get_file('name1').read(), 'text-merged-by-hook')
374
374
        self.assertEqual([('inactive',), ('success',)], self.hook_log)
375
375
 
376
376
    def test_chain_when_not_applicable(self):
384
384
        conflicts = builder.merge(self.merge_type)
385
385
        self.assertEqual(conflicts, [])
386
386
        self.assertEqual(
387
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
387
            builder.this.get_file('name1').read(), 'text-merged-by-hook')
388
388
        self.assertEqual([('no-op',), ('success',)], self.hook_log)
389
389
 
390
390
    def test_chain_stops_after_success(self):