diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-09-02 12:18:21 -0400 |
| commit | cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b (patch) | |
| tree | e9bdcbc699eda6db5e57d35b25d222bead96da12 /tests/unittests/test_merging.py | |
| parent | fbfd3789ede42ad50e0b79f202ab18b65537af52 (diff) | |
| parent | e39abc783f7edd6435dbc7ea1fc3d02e6b3955d3 (diff) | |
| download | vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.tar.gz vyos-cloud-init-cc77628e1ee3cd03d1ec2e17f1d744c8f4b0938b.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" |