From 83be006e288c58a46f5b76c29b6886c1f417d88c Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 15 Mar 2017 10:19:34 +0100 Subject: Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed Imported using git-ubuntu import. Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd New changelog entries: * New upstream release (LP: #1661750). * debian/control: - Change the maintainer to Ubuntu Developers (LP: #1657528). - Add the dependency of isc-dhcp-client as our maintainer scripts assume it's installed. - Add trailing commas to dependencies, add whitespaces. * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error). * debian/docs: - Remove LICENSE.txt as it's redundant. * debian/postinst: - Stop checking for update-initramfs existence using the absolute path, use the 'command' command instead to make lintian happy. * Remove debian/patches/disable-auto-update.patch: - We now ship with auto-updates enabled (LP: #1650522). * debian/maintscript: - Add a maintscript to rename the old logrotate file on upgrade from an ancient version of walinuxagent (LP: #1673152). --- tests/daemon/test_daemon.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/daemon/test_daemon.py') diff --git a/tests/daemon/test_daemon.py b/tests/daemon/test_daemon.py index 263af49..77b4e3e 100644 --- a/tests/daemon/test_daemon.py +++ b/tests/daemon/test_daemon.py @@ -15,9 +15,9 @@ # Requires Python 2.4+ and Openssl 1.0+ # -from tests.tools import * -from azurelinuxagent.common.exception import * from azurelinuxagent.daemon import * +from tests.tools import * + class MockDaemonCall(object): def __init__(self, daemon_handler, count): -- cgit v1.2.3