← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commands.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commands.py
95
95
class TestGetAlias(tests.TestCase):
96
96
 
97
97
    def _get_config(self, config_text):
98
 
        my_config = config.GlobalConfig.from_string(config_text)
 
98
        my_config = config.GlobalConfig()
 
99
        config_file = StringIO(config_text.encode('utf-8'))
 
100
        my_config._parser = my_config._get_parser(file=config_file)
99
101
        return my_config
100
102
 
101
103
    def test_simple(self):
344
346
        self.assertEqual(['called'], hook_calls)
345
347
        self.assertSubset(['foo', 'bar'], cmds)
346
348
 
347
 
 
348
349
class TestDeprecations(tests.TestCase):
349
350
 
350
351
    def test_shlex_split_unicode_deprecation(self):