← 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: Haw Loeung (hloeung)
  • Date: 2012-07-24 12:53:36 UTC
  • mfrom: (6541 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6542.
  • Revision ID: haw.loeung@canonical.com-20120724125336-r3wzxm02lyec7jm6
[hloeung] Merged with upstream resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_debug.py
29
29
    def test_set_debug_flags_from_config(self):
30
30
        # test both combinations because configobject automatically splits up
31
31
        # comma-separated lists
32
 
        self.try_debug_flags(['hpss', 'error'], 'debug_flags = hpss, error\n')
33
 
        self.try_debug_flags(['hpss'], 'debug_flags = hpss\n')
 
32
        self.assertDebugFlags(['hpss', 'error'], 'debug_flags = hpss, error\n')
 
33
        self.assertDebugFlags(['hpss'], 'debug_flags = hpss\n')
34
34
 
35
 
    def try_debug_flags(self, expected_flags, conf_bytes):
36
 
        conf = config.GlobalConfig.from_string(conf_bytes, save=True)
 
35
    def assertDebugFlags(self, expected_flags, conf_bytes):
 
36
        conf = config.GlobalStack()
 
37
        conf.store._load_from_string('[DEFAULT]\n' + conf_bytes)
 
38
        conf.store.save()
37
39
        self.overrideAttr(debug, 'debug_flags', set())
38
40
        debug.set_debug_flags_from_config()
39
41
        self.assertEqual(set(expected_flags), debug.debug_flags)