diff options
Diffstat (limited to 'src/software/test/test_installed_software_identity.py')
| -rwxr-xr-x | src/software/test/test_installed_software_identity.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/software/test/test_installed_software_identity.py b/src/software/test/test_installed_software_identity.py index 1065c20..b05b9c2 100755 --- a/src/software/test/test_installed_software_identity.py +++ b/src/software/test/test_installed_software_identity.py @@ -53,7 +53,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): classname="LMI_SoftwareIdentity", namespace="root/cimv2", keybindings=pywbem.NocaseDict({ - "InstanceID" : 'LMI:PKG:' + pkg.get_nevra(newer=newer, + "InstanceID" : 'LMI:SoftwareIdentity:' + pkg.get_nevra(newer=newer, with_epoch="ALWAYS") })) return objpath @@ -104,7 +104,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): self.assertEqual(objpath["System"], iname["System"]) nevra_set = set(i["InstalledSoftware"]["InstanceID"] for i in inames) for pkg in self.safe_pkgs: - nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS") + nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS") self.assertTrue(nevra in nevra_set, 'Missing nevra "%s".' % nevra) @@ -126,7 +126,7 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): self.assertEqual(inst[key], inst.path[key]) nevra_set = set(i["InstalledSoftware"]["InstanceID"] for i in insts) for pkg in self.safe_pkgs: - nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS") + nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS") self.assertTrue(nevra in nevra_set, "Missing pkg %s in nevra_set." % nevra) @@ -143,21 +143,21 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): inames1 = self.conn.EnumerateInstanceNames( ClassName=self.CLASS_NAME) self.assertGreater(len(inames1), 1) - self.assertIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"), + self.assertIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"), set(i["InstalledSoftware"]["InstanceID"] for i in inames1)) rpmcache.remove_pkg(pkg.name) inames2 = self.conn.EnumerateInstanceNames( ClassName=self.CLASS_NAME) self.assertEqual(len(inames1), len(inames2) + 1) - self.assertNotIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"), + self.assertNotIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"), set(i["InstalledSoftware"]["InstanceID"] for i in inames2)) rpmcache.install_pkg(pkg) inames3 = self.conn.EnumerateInstanceNames( ClassName=self.CLASS_NAME) self.assertEqual(len(inames1), len(inames3)) - self.assertIn('LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS"), + self.assertIn('LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS"), set(i["InstalledSoftware"]["InstanceID"] for i in inames3)) @base.mark_dangerous @@ -222,11 +222,11 @@ class TestInstalledSoftwareIdentity(base.SoftwareBaseTestCase): self.assertEqual(ref.namespace, 'root/cimv2') self.assertEqual(ref.classname, "LMI_SoftwareIdentity") self.assertEqual(sorted(ref.keys()), ["InstanceID"]) - self.assertTrue(ref["InstanceID"].startswith("LMI:PKG:")) + self.assertTrue(ref["InstanceID"].startswith("LMI:SoftwareIdentity:")) nevra_set = set(i["InstanceID"] for i in refs) for pkg in self.safe_pkgs: - nevra = 'LMI:PKG:'+pkg.get_nevra(with_epoch="ALWAYS") + nevra = 'LMI:SoftwareIdentity:'+pkg.get_nevra(with_epoch="ALWAYS") self.assertTrue(nevra in nevra_set, 'Missing nevra "%s".' % nevra) |