From ba825ea244c70d342e0098b4ab4f62507be70f12 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Tue, 7 Jun 2011 19:58:06 +0200
Subject: Greatly improved robustness of config parser - it can now take pretty
 much everything. Includes an updated config file which includes all the new
 additions

---
 git/test/fixtures/git_config | 16 +++++++++++-----
 git/test/test_config.py      |  6 ++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'git/test')

diff --git a/git/test/fixtures/git_config b/git/test/fixtures/git_config
index 3c91985f..ff8e7114 100644
--- a/git/test/fixtures/git_config
+++ b/git/test/fixtures/git_config
@@ -1,22 +1,28 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
-	bare = false
-	logallrefupdates = true
+    bare = false
+    logallrefupdates = true
 [remote "origin"]
 	fetch = +refs/heads/*:refs/remotes/origin/*
 	url = git://gitorious.org/~byron/git-python/byrons-clone.git
 	pushurl = git@gitorious.org:~byron/git-python/byrons-clone.git
-[branch "master"]
+# a tab indented section header
+	[branch "master"]
 	remote = origin
 	merge = refs/heads/master
-[remote "mainline"]
+# an space indented section header
+  [remote "mainline"]
+    # space indented comment
 	url = git://gitorious.org/git-python/mainline.git
 	fetch = +refs/heads/*:refs/remotes/mainline/*
+
 [remote "MartinMarcher"]
+	# tab indented comment
 	url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git
 	fetch = +refs/heads/*:refs/remotes/MartinMarcher/*
-[gui]
+    # can handle comments - the section name is supposed to be stripped
+[  gui ]
 	geometry = 1316x820+219+243 207 192
 [branch "mainline_performance"]
 	remote = mainline
diff --git a/git/test/test_config.py b/git/test/test_config.py
index d07fe6fd..d2e199e3 100644
--- a/git/test/test_config.py
+++ b/git/test/test_config.py
@@ -30,7 +30,9 @@ class TestConfig(TestBase):
             w_config.read()                 # enforce reading
             assert w_config._sections
             w_config.write()                # enforce writing
-            assert file_obj.getvalue() == file_obj_orig.getvalue()
+            
+            # we stripped lines when reading, so the results differ
+            assert file_obj.getvalue() != file_obj_orig.getvalue()
             
             # creating an additional config writer must fail due to exclusive access
             self.failUnlessRaises(IOError, GitConfigParser, file_obj, read_only = False)
@@ -56,10 +58,10 @@ class TestConfig(TestBase):
             
             file_obj.seek(0)
             r_config = GitConfigParser(file_obj, read_only=True)
+            #print file_obj.getvalue()
             assert r_config.has_section(sname)
             assert r_config.has_option(sname, oname)
             assert r_config.get(sname, oname) == val
-            
         # END for each filename
         
     def test_base(self):
-- 
cgit v1.2.1