diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-07-24 09:09:08 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-07-24 09:09:08 -0400 |
| commit | f7e63d61cffde091f0d876e4acc6778943cb7499 (patch) | |
| tree | bec7d2858d483d7cf20b455f8842baa9a1535242 /tests/unittests/test_merging.py | |
| parent | 27ce1e10692e93cfb9b87df547de4e0930ec4d28 (diff) | |
| parent | d6b77380f9e0a3d083300c6168c71466068094cf (diff) | |
| download | vyos-cloud-init-f7e63d61cffde091f0d876e4acc6778943cb7499.tar.gz vyos-cloud-init-f7e63d61cffde091f0d876e4acc6778943cb7499.zip | |
change trunk packaging to be more modern.
use pybuild and drop cdbs.
This also now runs test during that build and does then require build
dependencies.
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 486b9158..17704f8e 100644 --- a/tests/unittests/test_merging.py +++ b/tests/unittests/test_merging.py @@ -1,4 +1,4 @@ -from tests.unittests import helpers +from . import helpers from cloudinit.handlers import cloud_config from cloudinit.handlers import (CONTENT_START, CONTENT_END) |