summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Minar <miminar@redhat.com>2013-11-04 17:02:48 +0100
committerMichal Minar <miminar@redhat.com>2013-11-04 17:05:06 +0100
commit5e0a6b1ee73d2a32f61f72094b5e54a009e9cd86 (patch)
tree3fb0b2cc02c6e0c222bcd789dd087632f4202476 /src
parent8e8c32b6a1f9332eaf3697fc3dd8e2a6ead397ec (diff)
downloadopenlmi-providers-5e0a6b1ee73d2a32f61f72094b5e54a009e9cd86.tar.gz
openlmi-providers-5e0a6b1ee73d2a32f61f72094b5e54a009e9cd86.tar.xz
openlmi-providers-5e0a6b1ee73d2a32f61f72094b5e54a009e9cd86.zip
software: fixed SoftwareIdentityFileCheck
Make sure to check for correct TargetOperatingSystem for rhel.
Diffstat (limited to 'src')
-rw-r--r--src/software/test/test_software_identity_file_check.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/software/test/test_software_identity_file_check.py b/src/software/test/test_software_identity_file_check.py
index 9df54ab..7160d80 100644
--- a/src/software/test/test_software_identity_file_check.py
+++ b/src/software/test/test_software_identity_file_check.py
@@ -23,6 +23,7 @@ Unit tests for LMI_SoftwareIdentity provider.
"""
import os
+import platform
import pywbem
import re
import subprocess
@@ -80,13 +81,20 @@ 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(36), #LINUX
+ "TargetOperatingSystem" : pywbem.Uint16(target_operating_system),
"Version" : getattr(pkg, 'up_evra' if newer else 'evra')
})