← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

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