/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/tree_implementations/test_test_trees.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Tests for the test trees used by the tree_implementations tests."""
18
18
 
19
 
from bzrlib.tests import SymlinkFeature
20
 
from bzrlib.tests.tree_implementations import TestCaseWithTree
21
 
 
22
 
 
23
 
class TestTreeShapes(TestCaseWithTree):
 
19
from bzrlib import tests
 
20
from bzrlib.tests import tree_implementations
 
21
 
 
22
 
 
23
class TestTreeShapes(tree_implementations.TestCaseWithTree):
24
24
 
25
25
    def test_empty_tree_no_parents(self):
26
26
        tree = self.make_branch_and_tree('.')
147
147
        # currently this test tree requires unicode. It might be good
148
148
        # to have it simply stop having the single unicode file in it
149
149
        # when dealing with a non-unicode filesystem.
150
 
        self.requireFeature(SymlinkFeature)
 
150
        self.requireFeature(tests.SymlinkFeature)
151
151
        tree = self.get_tree_with_subdirs_and_all_content_types()
152
152
        tree.lock_read()
153
153
        self.addCleanup(tree.unlock)