diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
| commit | a9e4009ae7221ea167b3e1083a887564483e0350 (patch) | |
| tree | a370bd47399b1517c21b89d68aefd5afc15c5418 /tests/unittests/helpers.py | |
| parent | 4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip | |
Fix merge conflict
Diffstat (limited to 'tests/unittests/helpers.py')
| -rw-r--r-- | tests/unittests/helpers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py index c0da0983..5b4f4208 100644 --- a/tests/unittests/helpers.py +++ b/tests/unittests/helpers.py @@ -187,7 +187,8 @@ class FilesystemMockingTestCase(ResourceUsingTestCase): def populate_dir(path, files): - os.makedirs(path) + if not os.path.exists(path): + os.makedirs(path) for (name, content) in files.iteritems(): with open(os.path.join(path, name), "w") as fp: fp.write(content) |