[yum-cvs] 2 commits - test/depsolvetests.py

[James Bowes]

 test/depsolvetests.py |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 087a91e240381667cd388a8c3ac4f0603d3287b6
Author: James Bowes <jbowes at redhat.com>
Date:   Thu Aug 2 10:22:11 2007 -0400

    Also set _tsInfo on the TestingDepsolve

diff --git a/test/depsolvetests.py b/test/depsolvetests.py
index 23411bd..11c7fc3 100644
--- a/test/depsolvetests.py
+++ b/test/depsolvetests.py
@@ -52,6 +52,7 @@ class TestingDepsolve(depsolve.Depsolve):
 
         self.conf = FakeConf()
         self.tsInfo = tsInfo
+        self._tsInfo = tsInfo
         self.rpmdb = rpmdb
         self.pkgSack = pkgSack
 
commit c574c2a376a474c4cb57611c63d5967836194331
Author: James Bowes <jbowes at redhat.com>
Date:   Thu Aug 2 10:21:20 2007 -0400

    Create an init method for TestingDepsolve, and move appropriate logic there.

diff --git a/test/depsolvetests.py b/test/depsolvetests.py
index d9a9900..23411bd 100644
--- a/test/depsolvetests.py
+++ b/test/depsolvetests.py
@@ -47,6 +47,14 @@ class FakePackage(packages.PackageObject, packages.RpmBase):
 
 class TestingDepsolve(depsolve.Depsolve):
 
+    def __init__(self, tsInfo, rpmdb, pkgSack):
+        depsolve.Depsolve.__init__(self)
+
+        self.conf = FakeConf()
+        self.tsInfo = tsInfo
+        self.rpmdb = rpmdb
+        self.pkgSack = pkgSack
+
     def getInstalledPackageObject(self, pkgtup):
         return self.rpmdb.searchNevra(pkgtup[0], pkgtup[2], pkgtup[3],
                 pkgtup[4], pkgtup[1])[0]
@@ -57,11 +65,7 @@ def build_depsolver(tsInfo, rpmdb=packageSack.PackageSack(),
     # XXX this side-affect is hacky:
     tsInfo.setDatabases(rpmdb, pkgSack)
 
-    solver = TestingDepsolve()
-    solver.conf = FakeConf()
-    solver.tsInfo = tsInfo
-    solver.rpmdb = rpmdb
-    solver.pkgSack = pkgSack
+    solver = TestingDepsolve(tsInfo, rpmdb, pkgSack)
     return solver