summaryrefslogtreecommitdiff
path: root/git/test/test_config.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-08-17 16:14:38 +0200
committerSebastian Thiel <byronimo@gmail.com>2014-08-17 16:14:38 +0200
commitaa66d10bb6485af5941f1550dad77e825f384fed (patch)
tree4434dea0106459fb25f087d0a9ace8ce98fea688 /git/test/test_config.py
parent6d3d94c1e64716062eaeb170d967e9c8040e421f (diff)
parentf72477aa5b2f61b22bd6d9cc7567da3fc197d932 (diff)
downloadgitpython-aa66d10bb6485af5941f1550dad77e825f384fed.tar.gz
Merge pull request #183 from kmosher/master
Update the config parser using code from python2.7
Diffstat (limited to 'git/test/test_config.py')
-rw-r--r--git/test/test_config.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/git/test/test_config.py b/git/test/test_config.py
index b00240b0..dc4b52dc 100644
--- a/git/test/test_config.py
+++ b/git/test/test_config.py
@@ -77,18 +77,22 @@ class TestConfig(TestBase):
assert r_config._is_initialized == False
for section in r_config.sections():
num_sections += 1
- for option in r_config.options(section):
- num_options += 1
- val = r_config.get(section, option)
- val_typed = r_config.get_value(section, option)
- assert isinstance(val_typed, (bool, long, float, basestring))
- assert val
- assert "\n" not in option
- assert "\n" not in val
-
- # writing must fail
- self.failUnlessRaises(IOError, r_config.set, section, option, None)
- self.failUnlessRaises(IOError, r_config.remove_option, section, option)
+ if section != 'filter "indent"':
+ for option in r_config.options(section):
+ num_options += 1
+ val = r_config.get(section, option)
+ val_typed = r_config.get_value(section, option)
+ assert isinstance(val_typed, (bool, long, float, basestring))
+ assert val
+ assert "\n" not in option
+ assert "\n" not in val
+
+ # writing must fail
+ self.failUnlessRaises(IOError, r_config.set, section, option, None)
+ self.failUnlessRaises(IOError, r_config.remove_option, section, option)
+ else:
+ val = r_config.get(section, 'required')
+ assert val is None
# END for each option
self.failUnlessRaises(IOError, r_config.remove_section, section)
# END for each section