Change in vdsm[master]: testlib: use arch from lib

mpolednik at redhat.com mpolednik at redhat.com
Mon Dec 7 11:12:00 UTC 2015


Martin Polednik has uploaded a new change for review.

Change subject: testlib: use arch from lib
......................................................................

testlib: use arch from lib

Previous code duplicated the architecture information as caps module
couldn't easily be imported. The architecture is now in sitelib and the
module can use it directly.

Change-Id: I929b9258867377900fe161889465987ab44a6bc6
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M tests/testlib.py
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/73/49973/1

diff --git a/tests/testlib.py b/tests/testlib.py
index 378c1ed..17d7325 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -39,6 +39,7 @@
 from nose import result
 
 import vdsm
+from vdsm import cpuarch
 
 from monkeypatch import Patch
 from testValidation import SlowTestsPlugin, StressTestsPlugin
@@ -161,9 +162,9 @@
 def _vdsm_machine():
     return (
         _ARCH_REAL if _ARCH_REAL in (
-            # FIXME: this duplicates caps.Architecture, but
-            # we cannot import caps.py in this module.
-            'x86_64', 'ppc64', 'ppc64le'
+            cpuarch.Architecture.X86_64,
+            cpuarch.Architecture.PPC64,
+            cpuarch.Architecture.PPC64LE
         ) else _ARCH_FAKE
     )
 


-- 
To view, visit https://gerrit.ovirt.org/49973
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I929b9258867377900fe161889465987ab44a6bc6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik at redhat.com>


More information about the vdsm-patches mailing list