← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/test_tree.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_tree.py
323
323
        if kind == "SHA1":
324
324
            expected = osutils.sha_strings('file content')
325
325
            self.assertEqual(expected, data)
 
326
 
 
327
 
 
328
class TestHasVersionedDirectories(TestCaseWithTree):
 
329
 
 
330
    def test_has_versioned_directories(self):
 
331
        work_tree = self.make_branch_and_tree('tree')
 
332
        tree = self._convert_tree(work_tree)
 
333
        self.assertSubset([tree.has_versioned_directories()], (True, False))