diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:47:54 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:47:54 -0500 |
| commit | aae7fe638f61aaf02c6579d5b691a8641455c875 (patch) | |
| tree | ee449987b9076806975802e3843f0305736c3f1b /tests/unittests/test_merging.py | |
| parent | 9a771ec66f4e79bcd30f7cad7ef4b67e9cc7512d (diff) | |
| download | vyos-cloud-init-aae7fe638f61aaf02c6579d5b691a8641455c875.tar.gz vyos-cloud-init-aae7fe638f61aaf02c6579d5b691a8641455c875.zip | |
fix pep8 and pylint
Diffstat (limited to 'tests/unittests/test_merging.py')
| -rw-r--r-- | tests/unittests/test_merging.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py index fa7ee8e4..591a99c8 100644 --- a/tests/unittests/test_merging.py +++ b/tests/unittests/test_merging.py @@ -1,5 +1,3 @@ -import os - from tests.unittests import helpers from cloudinit import mergers @@ -107,8 +105,10 @@ class TestSimpleRun(helpers.MockerTestCase): self.assertEquals(merged['a'], [1, 'b', 2, 'e', 'f', 'g']) self.assertEquals(merged['b'], 'blahblahmore') self.assertEquals(merged['c']['f'], 'bigblobofstuff') - self.assertEquals(merged['run'], ['runme', 'runme2', 'morecmd', 'moremoremore']) - self.assertEquals(merged['runmereally'], ['e', ['a'], 'd', 'blah', ['b'], 'e']) + self.assertEquals(merged['run'], ['runme', 'runme2', 'morecmd', + 'moremoremore']) + self.assertEquals(merged['runmereally'], ['e', ['a'], 'd', 'blah', + ['b'], 'e']) def test_dict_overwrite_layered(self): source = { |