diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-15 20:13:07 -0400 |
| commit | bea35b7685978804557aada44c819c536ab209b3 (patch) | |
| tree | 070fb6db5efec8e0cd2e5d1d51d4c7f5e748085e /tests/unittests/test_merging.py | |
| parent | 668919511625f7b6a8922e4504e224e915f7be22 (diff) | |
| parent | 6093b8b2733814b9265494c47f4268167c9491ab (diff) | |
| download | vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.tar.gz vyos-cloud-init-bea35b7685978804557aada44c819c536ab209b3.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" |