summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2014-02-18 22:54:41 +0100
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-04-03 11:31:37 +0300
commit5d4f9cef82e420954cf7e6e1c957c6eda45ebc74 (patch)
treee81506a64ecd83c17d6f7a773ca4f0f4ccea36e5 /tests
parentf3aab35aa8cbef3846a81744ff6df696974f693d (diff)
downloadgit-buildpackage-5d4f9cef82e420954cf7e6e1c957c6eda45ebc74.tar.gz
git-buildpackage-5d4f9cef82e420954cf7e6e1c957c6eda45ebc74.tar.bz2
git-buildpackage-5d4f9cef82e420954cf7e6e1c957c6eda45ebc74.zip
config: Don't pull in config defaults twice
This would otherwise overwrite values set in the legacy config sections. Closes: #733759 (cherry picked from commit f1bc54279b6f2a9b8848196044ba5312e2af9aaf)
Diffstat (limited to 'tests')
-rw-r--r--tests/test_Config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_Config.py b/tests/test_Config.py
index c4666f4d..bbe4aecb 100644
--- a/tests/test_Config.py
+++ b/tests/test_Config.py
@@ -70,7 +70,7 @@ def test_parser_fallback():
>>> tmpdir = str(context.new_tmpdir('foo'))
>>> confname = os.path.join(tmpdir, 'gbp.conf')
>>> f = open(confname, 'w')
- >>> f.write('[foo]\\nthere = is\\n[git-foo]\\nno = truth\\n')
+ >>> f.write('[DEFAULT]\\nthere = was\\n[foo]\\nthere = is\\n[git-foo]\\nno = truth\\n')
>>> f.close()
>>> os.environ['GBP_CONF_FILES'] = confname
>>> parser = GbpOptionParser('foo')