[yum-cvs] 2 commits - test/depsolvetests.py yum/Errors.py yum/__init__.py yum/rpmsack.py yum/sqlitesack.py yum/transactioninfo.py

[James Bowes]

 test/depsolvetests.py  |   55 +++++++------------------------------------------
 yum/Errors.py          |    1 
 yum/__init__.py        |    1 
 yum/rpmsack.py         |    2 -
 yum/sqlitesack.py      |    2 -
 yum/transactioninfo.py |    2 -
 6 files changed, 10 insertions(+), 53 deletions(-)

New commits:
commit 6f2e4d16e04da1c0fabe01ec5388a50455bb07b1
Author: James Bowes <jbowes at redhat.com>
Date:   Wed Aug 1 20:13:51 2007 -0400

    Remove some unused imports

diff --git a/yum/Errors.py b/yum/Errors.py
index 55f084e..22902bf 100644
--- a/yum/Errors.py
+++ b/yum/Errors.py
@@ -17,7 +17,6 @@
 
 
 import exceptions
-import warnings
 
 
 class YumBaseError(exceptions.Exception):
diff --git a/yum/__init__.py b/yum/__init__.py
index 2ab4bb2..941d751 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -22,7 +22,6 @@ import re
 import types
 import errno
 import time
-import sre_constants
 import glob
 import fnmatch
 import logging
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index b32af4d..c2d5e52 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -22,7 +22,7 @@ from rpmUtils.transaction import initReadOnlyTransaction
 import misc
 import Errors
 from packages import YumInstalledPackage
-from packageSack import ListPackageSack, PackageSackBase
+from packageSack import PackageSackBase
 
 class RPMDBPackageSack(PackageSackBase):
     '''
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index ea051c4..86040c2 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -29,8 +29,6 @@ from packages import PackageObject, RpmBase, YumAvailablePackage
 import Errors
 import misc
 
-import warnings
-
 from sqlutils import executeSQL
 import rpmUtils.miscutils
 
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index 1fc172c..ce85d4f 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -21,7 +21,7 @@
 # with the given txmbr. 
 
 from constants import *
-from packageSack import ListPackageSack, PackageSack
+from packageSack import PackageSack
 from packages import YumInstalledPackage
 from sqlitesack import YumAvailablePackageSqlite
 import Errors
commit b117c36a01057260f6b0357ae50151ff1a3cdf27
Author: James Bowes <jbowes at redhat.com>
Date:   Wed Aug 1 20:05:23 2007 -0400

    Replace FakeRpmDb with a PackageSack in the depsolve tests.

diff --git a/test/depsolvetests.py b/test/depsolvetests.py
index 7141b0f..d9a9900 100644
--- a/test/depsolvetests.py
+++ b/test/depsolvetests.py
@@ -38,55 +38,13 @@ class FakePackage(packages.PackageObject, packages.RpmBase):
         self.repo = FakeRepo()
         self.repoid = None
 
+        # Just a unique integer
+        self.id = self.__hash__()
+
     def addRequires(self, name, flag, evr):
         self.prco['requires'].append((name, flag, evr))
 
 
-class FakeRpmDb(object):
-
-    def __init__(self):
-        self.packages = []
-
-    def addPackage(self, po):
-        self.packages.append(po)
-
-    def whatProvides(self, name, flag, evr):
-        results = []
-        for package in self.packages:
-            if package.checkPrco('provides', (name, flag, evr)):
-                results.append(package.pkgtup)
-        return results
-
-    def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
-        # Create a match closure for what is being searched for
-        lookfor = []        # A list of (search_name, search_value)
-        loc = locals()
-        for arg in ('name', 'arch', 'epoch', 'ver', 'rel'):
-            val = loc[arg]
-            if val != None:
-                lookfor.append((arg, val))
-
-        ret = []
-        for package in self.packages:
-            ok = True
-            for name, val in lookfor:
-                if getattr(package, name) != val:
-                    ok = False
-                    break
-            if ok:
-                ret.append(package)
-        return ret
-
-    def searchConflicts(self, name):
-        # XXX no conflicts support for now
-        return []
-
-    def installed(self, name):
-        for package in self.packages:
-            if package.name == name:
-                return True
-        return False
-
 class TestingDepsolve(depsolve.Depsolve):
 
     def getInstalledPackageObject(self, pkgtup):
@@ -94,8 +52,11 @@ class TestingDepsolve(depsolve.Depsolve):
                 pkgtup[4], pkgtup[1])[0]
 
 
-def build_depsolver(tsInfo, rpmdb=FakeRpmDb(),
+def build_depsolver(tsInfo, rpmdb=packageSack.PackageSack(),
         pkgSack=packageSack.PackageSack()):
+    # XXX this side-affect is hacky:
+    tsInfo.setDatabases(rpmdb, pkgSack)
+
     solver = TestingDepsolve()
     solver.conf = FakeConf()
     solver.tsInfo = tsInfo
@@ -137,7 +98,7 @@ class DepsolveTests(unittest.TestCase):
         tsInfo.addInstall(po)
 
         installedpo = FakePackage('zip', '1', '1', None, 'i386')
-        rpmdb = FakeRpmDb()
+        rpmdb = packageSack.PackageSack()
         rpmdb.addPackage(installedpo)
 
         solver = build_depsolver(tsInfo, rpmdb)