diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-05-10 14:25:13 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-05-10 14:25:13 -0700 |
| commit | 9f866ff5540558bab56f10e38481e4ad2efa079b (patch) | |
| tree | ccdec59d98e5b7ad74dc28bef0f388e514b86aef /tests/unittests/test_merging.py | |
| parent | 4d83822985bc45dacd611859d76aa5cc3e35e3bc (diff) | |
| download | vyos-cloud-init-9f866ff5540558bab56f10e38481e4ad2efa079b.tar.gz vyos-cloud-init-9f866ff5540558bab56f10e38481e4ad2efa079b.zip | |
fix pylint
Diffstat (limited to 'tests/unittests/test_merging.py')
| -rw-r--r-- | tests/unittests/test_merging.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py index 4c28f955..486b9158 100644 --- a/tests/unittests/test_merging.py +++ b/tests/unittests/test_merging.py @@ -11,7 +11,7 @@ import glob import os import random import re -import string +import string # pylint: disable=W0402 SOURCE_PAT = "source*.*yaml" EXPECTED_PAT = "expected%s.yaml" @@ -167,7 +167,7 @@ class TestSimpleRun(helpers.ResourceUsingTestCase): d = util.mergemanydict([a, b]) self.assertEquals(c, d) - def test_compat_merges_dict(self): + def test_compat_merges_dict2(self): a = { 'Blah': 1, 'Blah2': 2, |