~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
252
252
 
253
253
    def test_formats_to_scenarios(self):
254
254
        """The adapter can generate all the scenarios needed."""
255
 
        from bzrlib.tests.repository_implementations import formats_to_scenarios
 
255
        from bzrlib.tests.per_repository import formats_to_scenarios
256
256
        formats = [("(c)", remote.RemoteRepositoryFormat()),
257
257
                   ("(d)", repository.format_registry.get(
258
258
                        'Bazaar pack repository format 1 (needs bzr 0.92)\n'))]
293
293
    """Tests for the test adaption facilities."""
294
294
 
295
295
    def test_adapt_applies_scenarios(self):
296
 
        from bzrlib.tests.repository_implementations import TestScenarioApplier
 
296
        from bzrlib.tests.per_repository import TestScenarioApplier
297
297
        input_test = TestTestScenarioApplier("test_adapt_test_to_scenario")
298
298
        adapter = TestScenarioApplier()
299
299
        adapter.scenarios = [("1", "dict"), ("2", "settings")]
307
307
            (input_test, ("2", "settings"))], calls)
308
308
 
309
309
    def test_adapt_test_to_scenario(self):
310
 
        from bzrlib.tests.repository_implementations import TestScenarioApplier
 
310
        from bzrlib.tests.per_repository import TestScenarioApplier
311
311
        input_test = TestTestScenarioApplier("test_adapt_test_to_scenario")
312
312
        adapter = TestScenarioApplier()
313
313
        # setup two adapted tests