[Yum-devel] [PATCH 3/4] Fix installed obs. testcases, and mock out the returnObsoletePackages() API.

James Antill james at and.org
Tue Mar 26 22:36:26 UTC 2013


---
 test/simpleobsoletestests.py |    6 ++----
 test/testbase.py             |    8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/simpleobsoletestests.py b/test/simpleobsoletestests.py
index e9b2c09..5f0cdfb 100644
--- a/test/simpleobsoletestests.py
+++ b/test/simpleobsoletestests.py
@@ -247,14 +247,12 @@ class SimpleObsoletesTests(OperationsTests):
     def testObsoletesOffPostInst1(self):
         p = self.pkgs
         res, msg = self.runOperation(['install', 'zsh'], [p.obsoletes_i386], [p.installed_i386])
-        self.assert_(res=='ok', msg)
-        self.assertResult((p.obsoletes_i386,))
+        self.assert_(res=='empty', msg)
 
     def testObsoletesOffPostInst2(self):
         p = self.pkgs
         res, msg = self.runOperation(['install', 'zsh'], [p.obsoletes_i386], [p.installed_i386], {'obsoletes' : False})
-        self.assert_(res=='ok', msg)
-        self.assertResult((p.obsoletes_i386,))
+        self.assert_(res=='empty', msg)
 
     def testObsoletesOffPostAvail1(self):
         p = self.pkgs
diff --git a/test/testbase.py b/test/testbase.py
index c9bbb88..13ef821 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -321,6 +321,12 @@ class FakeRpmDb(packageSack.PackageSack):
             if len(pkg.conflicts):
                 ret.append(pkg)
         return ret
+    def returnObsoletePackages(self):
+        ret = []
+        for pkg in self.returnPackages():
+            if len(pkg.obsoletes):
+                ret.append(pkg)
+        return ret
     def fileRequiresData(self):
         installedFileRequires = {}
         installedUnresolvedFileRequires = set()
@@ -355,6 +361,8 @@ class FakeRpmDb(packageSack.PackageSack):
         return
     def transactionCacheConflictPackages(self, pkgs):
         return
+    def transactionCacheObsoletePackages(self, pkgs):
+        return
     def transactionResultVersion(self, rpmdbv):
         return
     def transactionReset(self):
-- 
1.7.7.6



More information about the Yum-devel mailing list