summaryrefslogtreecommitdiffstats
path: root/src/software/test/test_software_identity_checks.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/software/test/test_software_identity_checks.py')
-rw-r--r--src/software/test/test_software_identity_checks.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/software/test/test_software_identity_checks.py b/src/software/test/test_software_identity_checks.py
index c29fa47..8a8761d 100644
--- a/src/software/test/test_software_identity_checks.py
+++ b/src/software/test/test_software_identity_checks.py
@@ -66,9 +66,8 @@ class TestSoftwareIdentityChecks(swbase.SwTestCase):
for repo in self.repodb.values():
for pkg in repo.packages:
to_uninstall.add(pkg.name)
- to_uninstall = [p for p in to_uninstall if package.is_pkg_installed(p)]
- if to_uninstall:
- subprocess.call(['/usr/bin/rpm', '--quiet', '-e'] + to_uninstall)
+ to_uninstall = list(package.filter_installed_packages(to_uninstall))
+ package.remove_pkgs(to_uninstall)
@swbase.test_with_packages('stable#pkg1')
def test_get_instance(self):
@@ -136,7 +135,9 @@ class TestSoftwareIdentityChecks(swbase.SwTestCase):
"TargetOperatingSystem", "Version"])
self.assertEqual(ref.SoftwareElementID, pkg.nevra)
self.assertIn(ref.Name, pkg_names)
- self.assertEqual(ref.FailedFlags, [])
+ self.assertEqual(ref.FailedFlags, [],
+ "FailedFlags are empty for unmodified file %s:%s"
+ % (pkg, filepath))
pkg_names.remove(ref.Name)
self.assertEqual(len(pkg_names), 0)