Handle continuation lines in inifiles properly; stick a little closer to how python's ConfigParser parses

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2032 980ebf18-57e1-0310-9a29-db15c13687c0

3 files changed, 19 insertions, 0 deletions

diff --git a/test/data/types/yumrepos/fedora.repo b/test/data/types/yumrepos/fedora.repo
index ec3a1b3a8..995fa68ca 100644
--- a/test/data/types/yumrepos/fedora.repo
+++ b/test/data/types/yumrepos/fedora.repo
@@ -4,3 +4,6 @@ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+exclude=foo
+  bar
+  baz
diff --git a/test/other/inifile.rb b/test/other/inifile.rb
index 1bb20282b..5b1dfe0ae 100755
--- a/test/other/inifile.rb
+++ b/test/other/inifile.rb
@@ -80,6 +80,7 @@ class TestFileType < Test::Unit::TestCase
     end
 
     def test_whitespace
+        # FIXME: Should we really accept keys preceded by whitespace ?
         fname = mkfile("[main]\n  key1=v1\nkey2  =v2\n")
         assert_nothing_raised {
             @file.read(fname)
@@ -87,6 +88,20 @@ class TestFileType < Test::Unit::TestCase
         s = get_section('main')
         assert_equal('v1', s['key1'])
         assert_equal('v2', s['key2'])
+        # FIXME: We are losing whitespace around keys
+        assert_equal("[main]\nkey1=v1\nkey2=v2\n", s.format)
+    end
+
+    def test_continuation
+        cont = "[main]\nkey1=v1\nkey2=v2a\n v2b\n"
+        fname = mkfile(cont)
+        assert_nothing_raised {
+            @file.read(fname)
+        }
+        s = get_section('main')
+        assert_equal('v1', s['key1'])
+        assert_equal("v2a\n v2b", s['key2'])
+        assert_equal(cont, s.format)
     end
 
     def assert_entries(section, hash)
diff --git a/test/types/yumrepo.rb b/test/types/yumrepo.rb
index 72749a6fa..940fe1738 100755
--- a/test/types/yumrepo.rb
+++ b/test/types/yumrepo.rb
@@ -37,6 +37,7 @@ class TestYumRepo < Test::Unit::TestCase
         assert_equal('New description', inifile['development']['name'])
         assert_equal('Fedora Core $releasever - $basearch - Base',
                      inifile['base']['name'])
+        assert_equal("foo\n  bar\n  baz", inifile['base']['exclude'])
         assert_equal(['base', 'development', 'main'],
                      all_sections(inifile))
     end