← 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: Robert Collins
  • Date: 2006-04-18 22:41:16 UTC
  • mto: (1711.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1671.
  • Revision ID: robertc@robertcollins.net-20060418224116-9b723440fa56e404
 * 'Metadir' is now the default disk format. This improves behaviour in
   SFTP using circumstances and allows binding and rebinding and easier
   use of repositories. (Robert Collins, Aaron Bentley).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
205
205
        tree.unlock()
206
206
        self.assertEquals(our_lock.peek(), None)
207
207
 
 
208
 
 
209
class TestFormat2WorkingTree(TestCaseWithTransport):
 
210
    """Tests that are specific to format 2 trees."""
 
211
 
208
212
    def create_format2_tree(self, url):
209
 
        return BzrDir.create_standalone_workingtree(url)
 
213
        return self.make_branch_and_tree(
 
214
            url, format=bzrlib.bzrdir.BzrDirFormat6())
210
215
 
211
 
    def test_conflicts_format2(self):
 
216
    def test_conflicts(self):
212
217
        # test backwards compatability
213
218
        tree = self.create_format2_tree('.')
214
219
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,