← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_debug.py

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_debug.py
33
33
        self.try_debug_flags(['hpss'], 'debug_flags = hpss\n')
34
34
 
35
35
    def try_debug_flags(self, expected_flags, conf_bytes):
36
 
        conf = config.GlobalConfig.from_bytes(conf_bytes, save=True)
 
36
        conf = config.GlobalConfig.from_string(conf_bytes, save=True)
37
37
        self.overrideAttr(debug, 'debug_flags', set())
38
38
        debug.set_debug_flags_from_config()
39
39
        self.assertEqual(set(expected_flags), debug.debug_flags)