← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_debug.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_debug.py
34
34
 
35
35
    def assertDebugFlags(self, expected_flags, conf_bytes):
36
36
        conf = config.GlobalStack()
37
 
        conf.store._load_from_string(conf_bytes)
 
37
        conf.store._load_from_string('[DEFAULT]\n' + conf_bytes)
38
38
        conf.store.save()
39
39
        self.overrideAttr(debug, 'debug_flags', set())
40
40
        debug.set_debug_flags_from_config()