/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/test_osutils.py

  • Committer: Martin Pool
  • Date: 2010-12-09 04:26:53 UTC
  • mto: This revision was merged to the branch mainline in revision 5564.
  • Revision ID: mbp@canonical.com-20101209042653-hgy6vkrlfvi1d7rs
Change to using standard load_tests_apply_scenarios.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
38
38
    file_utils,
39
39
    test__walkdirs_win32,
40
40
    )
 
41
from bzrlib.tests.scenarios import load_tests_apply_scenarios
41
42
 
42
43
 
43
44
class _UTF8DirReaderFeature(tests.Feature):
96
97
    return scenarios
97
98
 
98
99
 
99
 
def load_tests(basic_tests, module, loader):
100
 
    suite = loader.suiteClass()
101
 
    dir_reader_tests, remaining_tests = tests.split_suite_by_condition(
102
 
        basic_tests, tests.condition_isinstance(TestDirReader))
103
 
    tests.multiply_tests(dir_reader_tests, dir_reader_scenarios(), suite)
104
 
    suite.addTest(remaining_tests)
105
 
    return suite
 
100
load_tests = load_tests_apply_scenarios
106
101
 
107
102
 
108
103
class TestContainsWhitespace(tests.TestCase):
1733
1728
 
1734
1729
class TestDirReader(tests.TestCaseInTempDir):
1735
1730
 
 
1731
    scenarios = dir_reader_scenarios()
 
1732
 
1736
1733
    # Set by load_tests
1737
1734
    _dir_reader_class = None
1738
1735
    _native_to_unicode = None