Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CD6C2200B3C for ; Wed, 13 Jul 2016 11:44:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CAB8E160A7C; Wed, 13 Jul 2016 09:44:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A67DA160A8C for ; Wed, 13 Jul 2016 11:44:16 +0200 (CEST) Received: (qmail 40602 invoked by uid 500); 13 Jul 2016 09:44:15 -0000 Mailing-List: contact notifications-help@libcloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@libcloud.apache.org Delivered-To: mailing list notifications@libcloud.apache.org Received: (qmail 40435 invoked by uid 500); 13 Jul 2016 09:44:15 -0000 Delivered-To: apmail-libcloud-commits@libcloud.apache.org Received: (qmail 40397 invoked by uid 99); 13 Jul 2016 09:44:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2016 09:44:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EB81ED49A; Wed, 13 Jul 2016 09:44:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tomaz@apache.org To: commits@libcloud.apache.org Date: Wed, 13 Jul 2016 09:44:26 -0000 Message-Id: <245af7c0d91a46a48db9e562d6020f4d@git.apache.org> In-Reply-To: <71b568872f8d490babcdda243d90e45f@git.apache.org> References: <71b568872f8d490babcdda243d90e45f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/14] libcloud git commit: Always use packaged mock. archived-at: Wed, 13 Jul 2016 09:44:17 -0000 Always use packaged mock. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d9fc1eda Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d9fc1eda Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d9fc1eda Branch: refs/heads/trunk Commit: d9fc1edaf6b3f52b1141ab80c1d88d97a964380a Parents: 01c6db4 Author: Tomaz Muraus Authored: Wed Jul 13 11:34:47 2016 +0200 Committer: Tomaz Muraus Committed: Wed Jul 13 11:34:47 2016 +0200 ---------------------------------------------------------------------- libcloud/test/compute/test_libvirt_driver.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/d9fc1eda/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 22391da..be8513b 100644 --- a/libcloud/test/compute/test_libvirt_driver.py +++ b/libcloud/test/compute/test_libvirt_driver.py @@ -15,15 +15,15 @@ import sys -from libcloud.compute.drivers.libvirt_driver import LibvirtNodeDriver -from libcloud.utils.py3 import unittest2_required +import mock +from libcloud.compute.drivers.libvirt_driver import LibvirtNodeDriver from libcloud.test import unittest -if unittest2_required: - import mock -else: - from unittest import mock + +__all__ = [ + 'LibvirtNodeDriverTestCase' +] @mock.patch('libcloud.compute.drivers.libvirt_driver.libvirt', autospec=True)