import mock from the correct unittest module Signed-off-by: Tomaz Muraus <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fbf2291e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fbf2291e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fbf2291e Branch: refs/heads/trunk Commit: fbf2291efe4c4211eacca6ebd880da10fd04a0aa Parents: 034c9a0 Author: Rene Kjellerup <[email protected]> Authored: Tue Jul 12 14:25:09 2016 -0700 Committer: Tomaz Muraus <[email protected]> Committed: Wed Jul 13 11:31:20 2016 +0200 ---------------------------------------------------------------------- libcloud/test/compute/test_libvirt_driver.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/fbf2291e/libcloud/test/compute/test_libvirt_driver.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_libvirt_driver.py b/libcloud/test/compute/test_libvirt_driver.py index 9bc46ce..ad26b81 100644 --- a/libcloud/test/compute/test_libvirt_driver.py +++ b/libcloud/test/compute/test_libvirt_driver.py @@ -16,10 +16,14 @@ import sys from libcloud.compute.drivers.libvirt_driver import LibvirtNodeDriver +from libcloud.utils.py3 import unittest2_required from libcloud.test import unittest -from unittest import mock +if unittest2_required: + from unittest2 import mock +else: + from unittest import mock @mock.patch('libcloud.compute.drivers.libvirt_driver.libvirt', autospec=True)
