From 66f6d2d4fd1e8c1b397c9533ee0596d7b09e9824 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Thu, 11 Oct 2012 18:48:50 -0700
Subject: Update to use pipes.quote to ensure that variables adjusted in
 sysconfig files are properly quoted for there common use case, that being
 sourced into shell scripts.

---
 tests/unittests/test_distros/test_sysconfig.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'tests/unittests/test_distros')

diff --git a/tests/unittests/test_distros/test_sysconfig.py b/tests/unittests/test_distros/test_sysconfig.py
index 196d090d..a07a251e 100644
--- a/tests/unittests/test_distros/test_sysconfig.py
+++ b/tests/unittests/test_distros/test_sysconfig.py
@@ -1,5 +1,7 @@
 from mocker import MockerTestCase
 
+import re
+
 from cloudinit.distros.parsers.sys_conf import SysConf
 
 
@@ -7,6 +9,11 @@ from cloudinit.distros.parsers.sys_conf import SysConf
 # http://content.hccfl.edu/pollock/AUnix1/SysconfigFilesDesc.txt
 
 class TestSysConfHelper(MockerTestCase):
+    def assertRegexpMatches(self, text, regexp):
+        regexp = re.compile(regexp)
+        self.assertTrue(regexp.search(text),
+                        msg="%s must match %s!" % (text, regexp.pattern))
+
     def test_parse_no_change(self):
         contents = '''# A comment
 USESMBAUTH=no
@@ -16,8 +23,8 @@ HOSTNAME=blahblah
 NETMASK0=255.255.255.0
 # Inline comment
 LIST=$LOGROOT/incremental-list
-IPV6TO4_ROUTING="eth0-:0004::1/64 eth1-:0005::1/64"
-ETHTOOL_OPTS="-K ${DEVICE} tso on; -G ${DEVICE} rx 256 tx 256"
+IPV6TO4_ROUTING='eth0-:0004::1/64 eth1-:0005::1/64'
+ETHTOOL_OPTS='-K ${DEVICE} tso on; -G ${DEVICE} rx 256 tx 256'
 USEMD5=no'''
         conf = SysConf(contents.splitlines())
         self.assertEquals(conf['HOSTNAME'], 'blahblah')
@@ -25,6 +32,7 @@ USEMD5=no'''
         # Should be unquoted
         self.assertEquals(conf['ETHTOOL_OPTS'], ('-K ${DEVICE} tso on; '
                                                  '-G ${DEVICE} rx 256 tx 256'))
+        # This is harmless convertion
         self.assertEquals(contents, str(conf))
 
     def test_parse_adjust(self):
@@ -36,7 +44,7 @@ USEMD5=no'''
         conf['IPV6TO4_ROUTING'] = "blah \tblah"
         contents2 = str(conf).strip()
         # Should be requoted due to whitespace
-        self.assertEquals('IPV6TO4_ROUTING="blah \tblah"', contents2)
+        self.assertRegexpMatches(contents2, r'IPV6TO4_ROUTING=["\']blah \tblah["\']')
 
     def test_parse_no_adjust_shell(self):
         conf = SysConf(''.splitlines())
-- 
cgit v1.2.3