diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-10 15:06:51 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-10 15:06:51 -0400 |
| commit | 0ea631a556522060f5075496adbac5f5637e7597 (patch) | |
| tree | ec363e83bd7ab44b61a19c96209a9123749c459c /tests/unittests/test_merging.py | |
| parent | 6386accbf4933ecb368d2f32b7db95583e03b525 (diff) | |
| parent | 67f198ceb6dfeb82b2d3f78955d21d09d43fa7db (diff) | |
| download | vyos-cloud-init-0ea631a556522060f5075496adbac5f5637e7597.tar.gz vyos-cloud-init-0ea631a556522060f5075496adbac5f5637e7597.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" |