summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:07:12 +0100
committerDimitri John Ledkov <dimitri.ledkov@canonical.com>2014-07-23 17:07:12 +0100
commit3cb605bf3cad72e692c154d41fb1e24b41033f2c (patch)
tree4ac525abd9e5e3f04016eddb6e32394dfad0e6bd
parent26467c0a45106bf12b6d4f82bb4ed1aa3e0dc686 (diff)
downloadvyos-cloud-init-3cb605bf3cad72e692c154d41fb1e24b41033f2c.tar.gz
vyos-cloud-init-3cb605bf3cad72e692c154d41fb1e24b41033f2c.zip
Use nosetests and absolute imports
-rwxr-xr-xpackages/debian/rules2
-rw-r--r--tests/unittests/test_builtin_handlers.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/debian/rules b/packages/debian/rules
index f2516c93..6bf78377 100755
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -2,7 +2,7 @@
INIT_SYSTEM ?= upstart,systemd
export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
-export PYBUILD_TEST_ARGS=--test-nose
+export PYBUILD_TEST_NOSE=1
%:
dh $@ --with python2,systemd --buildsystem pybuild
diff --git a/tests/unittests/test_builtin_handlers.py b/tests/unittests/test_builtin_handlers.py
index b387f13b..af7f442e 100644
--- a/tests/unittests/test_builtin_handlers.py
+++ b/tests/unittests/test_builtin_handlers.py
@@ -2,7 +2,7 @@
import os
-from tests.unittests import helpers as test_helpers
+from . import helpers as test_helpers
from cloudinit import handlers
from cloudinit import helpers