diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:00:39 -0400 |
| commit | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (patch) | |
| tree | 186d80c155d32f75d8efa3c6ec1ad3562f11ba0a /tests/unittests/test_merging.py | |
| parent | 26e6c265277cf5e29b8af311f2bb8759b0e811cd (diff) | |
| parent | b76866ad72d433cc9008a137c464c7ed44401549 (diff) | |
| download | vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.tar.gz vyos-cloud-init-b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488.zip | |
merge from trunk
Diffstat (limited to 'tests/unittests/test_merging.py')
| -rw-r--r-- | tests/unittests/test_merging.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py index 17704f8e..07b610f7 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 # pylint: disable=W0402 +import string SOURCE_PAT = "source*.*yaml" EXPECTED_PAT = "expected%s.yaml" |