diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-12 22:06:11 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-11-12 22:06:11 -0800 |
| commit | aa6fe50ac4e09490a16c7b7200d57496d9f755bf (patch) | |
| tree | 8741f0232ca1de144223ace65f2477fd6f8919f6 /tests/unittests/test_distros/test_netconfig.py | |
| parent | 8d5e1e108b0cdd3af872383da7654bec91355b5f (diff) | |
| parent | 29b4adef881852169c6a0c5c95168c768cb6ffc5 (diff) | |
| download | vyos-cloud-init-aa6fe50ac4e09490a16c7b7200d57496d9f755bf.tar.gz vyos-cloud-init-aa6fe50ac4e09490a16c7b7200d57496d9f755bf.zip | |
Rebased with HEAD and resolved conflicts.
Diffstat (limited to 'tests/unittests/test_distros/test_netconfig.py')
| -rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index 55765f0c..9763b14b 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -9,6 +9,8 @@ from cloudinit import helpers from cloudinit import settings from cloudinit import util +from cloudinit.distros.parsers.sys_conf import SysConf + from StringIO import StringIO @@ -83,9 +85,8 @@ class TestNetCfgDistro(MockerTestCase): self.assertEquals(write_buf.mode, 0644) def assertCfgEquals(self, blob1, blob2): - cfg_tester = distros.rhel.QuotingConfigObj - b1 = dict(cfg_tester(blob1.strip().splitlines())) - b2 = dict(cfg_tester(blob2.strip().splitlines())) + b1 = dict(SysConf(blob1.strip().splitlines())) + b2 = dict(SysConf(blob2.strip().splitlines())) self.assertEquals(b1, b2) for (k, v) in b1.items(): self.assertIn(k, b2) |