[lxc-devel] [nova-lxd/master] Fix tests

[rockstar on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 305 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160217/9e6d7b1f/attachment.bin>
-------------- next part --------------
From c61a559d1f8df246da4d39851c5faeabed6a8a26 Mon Sep 17 00:00:00 2001
From: Paul Hummer <paul at eventuallyanyway.com>
Date: Wed, 17 Feb 2016 11:50:56 -0700
Subject: [PATCH 1/2] Add a broken dependency issue

---
 requirements.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index bac0f43..8d88392 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,8 @@ oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.utils>=3.4.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0
+
+# XXX: rockstar (17 Feb 2016) - oslo_config imports
+# debtcollector, which imports this, but doesn't
+# require it in dependencies.
+wrapt==1.10.6

From 1ef908ea70640a5dc73a2d38c6bdc1490fe8d8fc Mon Sep 17 00:00:00 2001
From: Paul Hummer <paul at eventuallyanyway.com>
Date: Wed, 17 Feb 2016 11:51:07 -0700
Subject: [PATCH 2/2] Fix the imports for pylxd.exceptions to
 pylxd.deprecated.exceptions

---
 nova_lxd/nova/virt/lxd/host.py           | 4 ++--
 nova_lxd/nova/virt/lxd/session.py        | 4 ++--
 nova_lxd/tests/session/test_container.py | 2 +-
 nova_lxd/tests/session/test_profile.py   | 2 +-
 nova_lxd/tests/session/test_snapshot.py  | 2 +-
 nova_lxd/tests/test_driver_api.py        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nova_lxd/nova/virt/lxd/host.py b/nova_lxd/nova/virt/lxd/host.py
index b5cf1b2..5106966 100644
--- a/nova_lxd/nova/virt/lxd/host.py
+++ b/nova_lxd/nova/virt/lxd/host.py
@@ -27,8 +27,8 @@
 from nova import utils
 import os
 import platform
-from pylxd import api
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import api
+from pylxd.deprecated import exceptions as lxd_exceptions
 import socket
 
 from oslo_config import cfg
diff --git a/nova_lxd/nova/virt/lxd/session.py b/nova_lxd/nova/virt/lxd/session.py
index 37511ea..246f72d 100644
--- a/nova_lxd/nova/virt/lxd/session.py
+++ b/nova_lxd/nova/virt/lxd/session.py
@@ -27,8 +27,8 @@
 from oslo_service import loopingcall
 from oslo_utils import excutils
 
-from pylxd import api
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import api
+from pylxd.deprecated import exceptions as lxd_exceptions
 import six
 
 from nova_lxd.nova.virt.lxd import constants
diff --git a/nova_lxd/tests/session/test_container.py b/nova_lxd/tests/session/test_container.py
index ac68fe2..e9a3c43 100644
--- a/nova_lxd/tests/session/test_container.py
+++ b/nova_lxd/tests/session/test_container.py
@@ -26,7 +26,7 @@
 from nova.compute import power_state
 from nova import exception
 from nova import test
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import exceptions as lxd_exceptions
 
 from nova_lxd.nova.virt.lxd import session
 from nova_lxd.tests import fake_api
diff --git a/nova_lxd/tests/session/test_profile.py b/nova_lxd/tests/session/test_profile.py
index 9698a3f..2680849 100644
--- a/nova_lxd/tests/session/test_profile.py
+++ b/nova_lxd/tests/session/test_profile.py
@@ -19,7 +19,7 @@
 
 from nova import exception
 from nova import test
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import exceptions as lxd_exceptions
 
 from nova_lxd.nova.virt.lxd import session
 from nova_lxd.tests import fake_api
diff --git a/nova_lxd/tests/session/test_snapshot.py b/nova_lxd/tests/session/test_snapshot.py
index a2984d9..61759d6 100644
--- a/nova_lxd/tests/session/test_snapshot.py
+++ b/nova_lxd/tests/session/test_snapshot.py
@@ -18,7 +18,7 @@
 
 from nova import exception
 from nova import test
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import exceptions as lxd_exceptions
 
 from nova_lxd.nova.virt.lxd import session
 from nova_lxd.tests import fake_api
diff --git a/nova_lxd/tests/test_driver_api.py b/nova_lxd/tests/test_driver_api.py
index 9a23a3f..f769924 100644
--- a/nova_lxd/tests/test_driver_api.py
+++ b/nova_lxd/tests/test_driver_api.py
@@ -17,7 +17,7 @@
 import json
 import os
 import platform
-from pylxd import exceptions as lxd_exceptions
+from pylxd.deprecated import exceptions as lxd_exceptions
 
 import ddt
 import mock