File 0001-Fix-unittest-run-on-s390x-host.patch of Package python-os-brick

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-unittest-run-on-s390x-host.patch of Package python-os-brick (Revision 2e40f319d597b94128ef29c8bf268aee)

Currently displaying revision 2e40f319d597b94128ef29c8bf268aee , Show latest

From 7a74d9cec62c7518a203ac596aa2734f97ddd4ff Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Sun, 20 Nov 2016 19:15:09 +0100
Subject: [PATCH] Fix unittest run on s390x host

Explicitely mention a supported architecture when doing factory
tests, otherwise instantiation fails on hosts that do not support
them

Change-Id: Icccd955a27c8606b520f4426205d5489fc1c736d
(cherry picked from commit 928ced139c390e2f047ecf40d7615346f941c82b)
---
 os_brick/tests/initiator/connectors/test_hgst.py |  2 +-
 os_brick/tests/initiator/test_connector.py       | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/os_brick/tests/initiator/connectors/test_hgst.py b/os_brick/tests/initiator/connectors/test_hgst.py
index 17e18c8..d37c88e 100644
--- a/os_brick/tests/initiator/connectors/test_hgst.py
+++ b/os_brick/tests/initiator/connectors/test_hgst.py
@@ -96,7 +96,7 @@ Request Succeeded
 
     def test_factory(self):
         """Can we instantiate a HGSTConnector of the right kind?"""
-        obj = connector.InitiatorConnector.factory('HGST', None)
+        obj = connector.InitiatorConnector.factory('HGST', None, arch='x86_64')
         self.assertEqual("HGSTConnector", obj.__class__.__name__)
 
     def test_get_search_path(self):
diff --git a/os_brick/tests/initiator/test_connector.py b/os_brick/tests/initiator/test_connector.py
index 5e16a57..bee7bc1 100644
--- a/os_brick/tests/initiator/test_connector.py
+++ b/os_brick/tests/initiator/test_connector.py
@@ -182,14 +182,15 @@ class ConnectorTestCase(test_base.TestCase):
         obj = connector.InitiatorConnector.factory('iscsi', None)
         self.assertEqual("ISCSIConnector", obj.__class__.__name__)
 
-        obj = connector.InitiatorConnector.factory('fibre_channel', None)
+        obj = connector.InitiatorConnector.factory('fibre_channel', None,
+                                                   arch='x86_64')
         self.assertEqual("FibreChannelConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory('fibre_channel', None,
                                                    arch='s390x')
         self.assertEqual("FibreChannelConnectorS390X", obj.__class__.__name__)
 
-        obj = connector.InitiatorConnector.factory('aoe', None)
+        obj = connector.InitiatorConnector.factory('aoe', None, arch='x86_64')
         self.assertEqual("AoEConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory(
@@ -197,11 +198,13 @@ class ConnectorTestCase(test_base.TestCase):
         self.assertEqual("RemoteFsConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory(
-            'glusterfs', None, glusterfs_mount_point_base='/mnt/test')
+            'glusterfs', None, glusterfs_mount_point_base='/mnt/test',
+            arch='x86_64')
         self.assertEqual("RemoteFsConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory(
-            'scality', None, scality_mount_point_base='/mnt/test')
+            'scality', None, scality_mount_point_base='/mnt/test',
+            arch='x86_64')
         self.assertEqual("RemoteFsConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory('local', None)
@@ -210,17 +213,21 @@ class ConnectorTestCase(test_base.TestCase):
         obj = connector.InitiatorConnector.factory('gpfs', None)
         self.assertEqual("GPFSConnector", obj.__class__.__name__)
 
-        obj = connector.InitiatorConnector.factory('huaweisdshypervisor', None)
+        obj = connector.InitiatorConnector.factory(
+            'huaweisdshypervisor', None, arch='x86_64')
         self.assertEqual("HuaweiStorHyperConnector", obj.__class__.__name__)
 
-        obj = connector.InitiatorConnector.factory("scaleio", None)
+        obj = connector.InitiatorConnector.factory(
+            "scaleio", None, arch='x86_64')
         self.assertEqual("ScaleIOConnector", obj.__class__.__name__)
 
         obj = connector.InitiatorConnector.factory(
-            'quobyte', None, quobyte_mount_point_base='/mnt/test')
+            'quobyte', None, quobyte_mount_point_base='/mnt/test',
+            arch='x86_64')
         self.assertEqual("RemoteFsConnector", obj.__class__.__name__)
 
-        obj = connector.InitiatorConnector.factory("disco", None)
+        obj = connector.InitiatorConnector.factory(
+            "disco", None, arch='x86_64')
         self.assertEqual("DISCOConnector", obj.__class__.__name__)
 
         self.assertRaises(exception.InvalidConnectorProtocol,
-- 
2.13.3

Places

File 0001-Fix-unittest-run-on-s390x-host.patch of Package python-os-brick (Revision 2e40f319d597b94128ef29c8bf268aee)

Places