~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.py

[merge] test renames and other fixes (John)

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
#import bzrlib specific imports here
26
26
import bzrlib.config as config
27
27
import bzrlib.errors as errors
28
 
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
28
from bzrlib.tests import TestCase, TestCaseInTempDir
29
29
 
30
30
 
31
31
sample_config_text = ("[DEFAULT]\n"
66
66
                        "recurse=False\n"
67
67
                        "[/a/c]\n"
68
68
                        "check_signatures=ignore\n"
69
 
                        "post_commit=bzrlib.selftest.testconfig.post_commit\n"
 
69
                        "post_commit=bzrlib.tests.test_config.post_commit\n"
70
70
                        "#testing explicit beats globs\n")
71
71
 
72
72
 
490
490
        
491
491
    def test_post_commit_default(self):
492
492
        self.get_location_config('/a/c')
493
 
        self.assertEqual('bzrlib.selftest.testconfig.post_commit',
 
493
        self.assertEqual('bzrlib.tests.test_config.post_commit',
494
494
                         self.my_config.post_commit())
495
495
 
496
496
 
588
588
            _get_global_config()._get_parser(config_file))
589
589
        branch_file = StringIO(sample_branches_text)
590
590
        my_config._get_location_config()._get_parser(branch_file)
591
 
        self.assertEqual('bzrlib.selftest.testconfig.post_commit',
 
591
        self.assertEqual('bzrlib.tests.test_config.post_commit',
592
592
                         my_config.post_commit())
593
593
 
594
594