/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 bzrlib/tests/test_versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2006-09-25 18:30:50 UTC
  • mto: This revision was merged to the branch mainline in revision 2040.
  • Revision ID: abentley@panoramicfeedback.com-20060925183050-057959b1247aacc8
Tweak test to avoid catching assert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_versionedfile.py
583
583
            for line in vf.iter_lines_added_or_present_in_versions(versions, 
584
584
                pb=progress):
585
585
                lines[line] += 1
586
 
            try:
587
 
                self.assertEqual([], progress.updates)
588
 
            except AssertionError:
589
 
                self.assertEqual(expected,
590
 
                                 progress.updates)
 
586
            if []!= progress.updates: 
 
587
                self.assertEqual(expected, progress.updates)
591
588
            return lines
592
589
        lines = iter_with_versions(['child', 'otherchild'], 
593
590
                                   [('Walking content.', 0, 2),