← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.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_workingtree.py
104
104
class SampleTreeFormat(workingtree.WorkingTreeFormat):
105
105
    """A sample format
106
106
 
107
 
    this format is initializable, unsupported to aid in testing the 
 
107
    this format is initializable, unsupported to aid in testing the
108
108
    open and open_downlevel routines.
109
109
    """
110
110
 
142
142
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
143
            self.failUnless(isinstance(found_format, format.__class__))
144
144
        check_format(workingtree.WorkingTreeFormat3(), "bar")
145
 
        
 
145
 
146
146
    def test_find_format_no_tree(self):
147
147
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
148
        self.assertRaises(errors.NoWorkingTree,
193
193
        t = control.get_workingtree_transport(None)
194
194
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
195
195
                             t.get('format').read())
196
 
        self.assertEqualDiff(t.get('inventory').read(), 
 
196
        self.assertEqualDiff(t.get('inventory').read(),
197
197
                              '<inventory format="5">\n'
198
198
                              '</inventory>\n',
199
199
                             )
202
202
        self.assertFalse(t.has('inventory.basis'))
203
203
        # no last-revision file means 'None' or 'NULLREVISION'
204
204
        self.assertFalse(t.has('last-revision'))
205
 
        # TODO RBC 20060210 do a commit, check the inventory.basis is created 
 
205
        # TODO RBC 20060210 do a commit, check the inventory.basis is created
206
206
        # correctly and last-revision file becomes present.
207
207
 
208
208
    def test_uses_lockdir(self):
209
209
        """WorkingTreeFormat3 uses its own LockDir:
210
 
            
 
210
 
211
211
            - lock is a directory
212
212
            - when the WorkingTree is locked, LockDir can see that
213
213
        """
286
286
    @needs_tree_write_lock
287
287
    def method_that_raises(self):
288
288
        """This method causes an exception when called with parameters.
289
 
        
 
289
 
290
290
        This allows the decorator code to be checked - it should still call
291
291
        unlock.
292
292
        """