← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_testament.py
141
141
        inventory = self.b.repository.get_inventory('test@user-2')
142
142
        testament_1 = self.testament_class()(revision, inventory)
143
143
        text_1 = testament_1.as_short_text()
144
 
        text_2 = self.from_revision(self.b.repository, 
 
144
        text_2 = self.from_revision(self.b.repository,
145
145
                                    'test@user-2').as_short_text()
146
146
        self.assertEqual(text_1, text_2)
147
 
                    
 
147
 
148
148
 
149
149
class TestamentTestsStrict(TestamentTests):
150
 
    
 
150
 
151
151
    def testament_class(self):
152
152
        return StrictTestament
153
153
 
154
154
 
155
155
class TestamentTestsStrict2(TestamentTests):
156
 
    
 
156
 
157
157
    def testament_class(self):
158
158
        return StrictTestament3
159
159