software: fixed a test

TargetOperatingSystem property is tested also in
TestSoftwareIdentityChecks, let's share the code in util module.

3 files changed, 19 insertions, 10 deletions

diff --git a/src/software/test/test_software_identity_checks.py b/src/software/test/test_software_identity_checks.py
index cc432ad..d0c7ba1 100644
--- a/src/software/test/test_software_identity_checks.py
+++ b/src/software/test/test_software_identity_checks.py
@@ -27,6 +27,7 @@ import unittest
 
 from lmi.test.lmibase import enable_lmi_exceptions
 import base
+import util
 
 class TestSoftwareIdentityChecks(base.SoftwareBaseTestCase):
     """
@@ -51,7 +52,7 @@ class TestSoftwareIdentityChecks(base.SoftwareBaseTestCase):
                 "SoftwareElementID" : pkg.get_nevra(
                         newer=newer, with_epoch="ALWAYS"),
                 "SoftwareElementState" : pywbem.Uint16(2),     #Executable
-                "TargetOperatingSystem" : pywbem.Uint16(36),   #LINUX
+                "TargetOperatingSystem" : util.get_target_operating_system(),
                 "Version" : getattr(pkg, 'up_evra' if newer else 'evra')
                 }),
             "Element" : self.ns.LMI_SoftwareIdentity.new_instance_name({
diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py
index d183933..485a970 100644
--- a/src/software/test/test_software_identity_file_check.py
+++ b/src/software/test/test_software_identity_file_check.py
@@ -23,7 +23,6 @@ Unit tests for LMI_SoftwareIdentity provider.
 """
 
 import os
-import platform
 import pywbem
 import re
 import subprocess
@@ -81,20 +80,13 @@ class TestSoftwareIdentityFileCheck(
         """
         :returns:  object path of `LMI_SoftwareIdentityFileCheck`
         """
-        target_operating_system = 36 # LINUX
-        if hasattr(platform, 'linux_distribution') and \
-                platform.linux_distribution(
-                        full_distribution_name=False)[0].lower() == 'redhat':
-            target_operating_system = 79 # RHEL
-            if platform.uname()[4].lower() == 'x86_64':
-                target_operating_system = 80 # RHEL 64bit
         return self.cim_class.new_instance_name({
             "CheckID" : 'LMI:LMI_SoftwareIdentityFileCheck',
             "Name" : file_name,
             "SoftwareElementID" : pkg.get_nevra(
                 newer=newer, with_epoch="ALWAYS"),
             "SoftwareElementState" : pywbem.Uint16(2),      #Executable
-            "TargetOperatingSystem" : pywbem.Uint16(target_operating_system),
+            "TargetOperatingSystem" : util.get_target_operating_system(),
             "Version" : getattr(pkg, 'up_evra' if newer else 'evra')
         })
 
diff --git a/src/software/test/util.py b/src/software/test/util.py
index 6de8169..c0cb4f0 100644
--- a/src/software/test/util.py
+++ b/src/software/test/util.py
@@ -23,6 +23,8 @@
 Common test utilities.
 """
 
+import platform
+import pywbem
 import re
 from subprocess import call, check_output
 
@@ -123,3 +125,17 @@ def make_identity_path(pkg, newer=True):
                 "InstanceID" : "LMI:LMI_SoftwareIdentity:%s" % pkg.get_nevra(
                     newer=newer)
             }))
+
+def get_target_operating_system():
+    """
+    :returns: integer corresponding for TargetOperatingProperty of CIM_Check
+        for this system
+    """
+    target_operating_system = 36 # LINUX
+    if hasattr(platform, 'linux_distribution') and \
+            platform.linux_distribution(
+                    full_distribution_name=False)[0].lower() == 'redhat':
+        target_operating_system = 79 # RHEL
+        if platform.uname()[4].lower() == 'x86_64':
+            target_operating_system = 80 # RHEL 64bit
+    return pywbem.Uint16(target_operating_system)