Merge lp:~jml/pkgme-devportal/remove-package-database into lp:pkgme-devportal

[Jonathan Lange]

Remove PackageDatabase and a bunch of test code.

Slowly killing things.

[lp:~jml/pkgme-devportal/remove-package-database]

178. By Jonathan Lange on 2012-11-13

More things that we don't need.

179. By Jonathan Lange on 2012-11-13

Merge changes from trunk.

=== modified file 'devportalbinary/database.py'
--- devportalbinary/database.py	2012-11-13 14:35:23 +0000
+++ devportalbinary/database.py	2012-11-13 14:35:23 +0000
@@ -1,135 +1,13 @@
 # Copyright 2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from storm.expr import And, Column, Select, Table
-from storm.locals import create_database, Store
-from storm.uri import URI as StormURI
-
 from .configuration import (
-    CONF_FILE_ENV_VAR,
-    get_config_file_path,
     load_configuration,
     )
 
 from libdep_service_client.client import Client
 
 
-class URI(StormURI):
-    """A stand-in for Storm's URI class.
-
-    This class implements the same interface as `storm.uri.URI`, except
-    that the constructor has a different signature. Storm's version takes
-    a string and parses it, this version can be used when you already
-    have a parsed version and just need to create the object.
-    """
-
-    # XXX: Only used by PackageDatabase, which is flagged for deletion.
-
-    def __init__(self, scheme=None, host=None, port=None, username=None,
-                 password=None, database=None, options=None):
-        self.scheme = scheme
-        self.host = host
-        self.port = port
-        self.username = username
-        self.password = password
-        self.database = database
-        self.options = options
-        if self.options is None:
-            self.options = dict()
-
-
-class PackageDatabase(object):
-
-    # XXX: No longer used within pkgme-devportal
-
-    SQLITE = 'sqlite'
-    POSTGRES = 'postgres'
-
-    def __init__(self, store):
-        self._store = store
-
-    @classmethod
-    def _get_storm_sqlite_connection_uri(cls, opts):
-        raise ValueError(
-            "SQLite is no longer supported, you must migrate to postgresql.")
-
-    @classmethod
-    def _get_storm_postgres_connection_uri(cls, opts):
-        if not getattr(opts, 'database_db_name', None):
-            raise ValueError(
-                "Can't create database, no connection info available. "
-                "You must specify %s. Looked in %s. "
-                "Perhaps %s is set incorrectly?" % (
-                    'db_name', get_config_file_path(), CONF_FILE_ENV_VAR))
-        return URI(scheme=opts.database_db_type,
-                   username=opts.database_username,
-                   password=opts.database_password,
-                   host=opts.database_host,
-                   port=opts.database_port,
-                   database=opts.database_db_name)
-
-    @classmethod
-    def _get_storm_connection_uri(cls, opts):
-        if opts.database_db_type == cls.POSTGRES:
-            return cls._get_storm_postgres_connection_uri(opts)
-        elif opts.database_db_type == cls.SQLITE:
-            return cls._get_storm_sqlite_connection_uri(opts)
-        else:
-            raise AssertionError(
-                "Unsupported database: %s" % opts.database_db_type)
-
-    @classmethod
-    def get_db_info_from_config(cls, opts):
-        return cls._get_storm_connection_uri(opts)
-
-    @classmethod
-    def get_store_from_config(cls, opts):
-        """Create a storm store based on a config file.
-
-        This method will create a storm store based
-        on the information in ``~/.config/pkgme-binary/conf``
-
-        :return: a tuple of (store, store_type), where store_type
-            is one of cls.SQLITE or cls.POSTGRES, indicating what
-            is at the other end of the store.
-        """
-        connection_info = cls.get_db_info_from_config(opts)
-        database = create_database(connection_info)
-        return Store(database)
-
-    @classmethod
-    def from_options(cls, options):
-        return cls(cls.get_store_from_config(options))
-
-    def _get_query(self, library_names, arch):
-        return Select(
-            [Column('library'), Column('dependency')],
-            And(Column('architecture') == arch,
-                Column('library').is_in(map(unicode, library_names))),
-            Table('libdep'))
-
-    def get_multiple_dependencies(self, library_names, arch):
-        """Get the binary packages that provide libraries.
-
-        :return: (deps, missing), where ``deps`` is a dict mapping library
-            names to sets of packages that provide them, and ``missing`` is a
-            set of library names for which no dependencies could be found.
-        """
-        arch = unicode(arch)
-        result = self._store.execute(self._get_query(library_names, arch))
-        found = {}
-        for row in result:
-            [lib, dependency] = row
-            if lib in found:
-                found[lib].add(dependency)
-            else:
-                found[lib] = set([dependency])
-        return found
-
-    def close(self):
-        self._store.close()
-
-
 class LibdepServiceClient(object):
     """Implements the read part of PackageDatabase's interface."""
 

=== modified file 'devportalbinary/testing.py'
--- devportalbinary/testing.py	2012-11-13 11:12:08 +0000
+++ devportalbinary/testing.py	2012-11-13 14:35:23 +0000
@@ -1,7 +1,6 @@
 # Copyright 2011-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-from contextlib import closing
 import json
 import os
 import random
@@ -21,11 +20,6 @@
     Fixture,
     TempDir,
     )
-from postgresfixture import ClusterFixture
-from storm.locals import create_database, Store
-from testresources import (
-    FixtureResource as _FixtureResource,
-    )
 from testtools import TestCase
 from treeshape import (
     from_rough_spec,
@@ -33,11 +27,7 @@
     )
 
 from devportalbinary.binary import MetadataBackend
-from devportalbinary.database import (
-    LibdepServiceClient,
-    PackageDatabase,
-    URI,
-    )
+from devportalbinary.database import LibdepServiceClient
 
 from devportalbinary.configuration import CONF_FILE_ENV_VAR
 
@@ -90,133 +80,6 @@
                              im.size[0], im.size[1], im.format))
 
 
-def get_db_schema_file_path(name):
-    return os.path.join(os.path.dirname(
-        os.path.abspath(__file__)), 'db', name)
-
-
-def get_db_schema_queries(filenames):
-    for filename in filenames:
-        path = get_db_schema_file_path(filename)
-        with open(path) as f:
-            yield f.read()
-
-
-class PostgresDatabaseFixture(Fixture):
-
-    def __init__(self):
-        super(PostgresDatabaseFixture, self).__init__()
-        self.db_name = "libdep"
-
-    def drop_db(self):
-        # stub suggests that dropping all tables would be quicker than
-        # dropping the db when the number of tables is small.
-        # select quote_ident(table_schema) || '.' ||
-        #   quote_ident(table_name) from information_schema.tables
-        #   WHERE table_schema = 'public';
-        self.cluster.dropdb(self.db_name)
-
-    def create_db(self):
-        self.cluster.createdb(self.db_name)
-        queries = [
-            'postgres_schema.sql',
-            'patch-00001.sql',
-            'patch-00002.sql',
-            ]
-        for patch in get_db_schema_queries(queries):
-            self._execute(patch)
-
-    def _execute(self, query):
-        with closing(self.cluster.connect(self.db_name)) as conn:
-            cur = conn.cursor()
-            cur.execute(query)
-            conn.commit()
-
-    def close_connection(self):
-        self.conn.close()
-
-    def open_connection(self):
-        db = create_database(URI(scheme='postgres',
-            host=self.cluster.datadir, database=self.db_name))
-        self.conn = Store(db)
-        self.addCleanup(self.close_connection)
-
-    def reset(self):
-        self.close_connection()
-        self.drop_db()
-        self.create_db()
-        self.open_connection()
-
-    def setUp(self):
-        super(PostgresDatabaseFixture, self).setUp()
-        self.tempdir = self.useFixture(TempDir())
-        self.cluster = self.useFixture(ClusterFixture(self.tempdir.path))
-        self.create_db()
-        self.open_connection()
-
-
-class FixtureResource(_FixtureResource):
-    """The built in FixtureResource doesn't get properly dirtied."""
-    # XXX: workaround for bug 1023423
-
-    def _get_dirty(self):
-        return True
-
-    def _set_dirty(self, new_val):
-        pass
-
-    _dirty = property(_get_dirty, _set_dirty)
-
-
-class PostgresDatabaseResource(FixtureResource):
-
-    def __init__(self):
-        fixture = PostgresDatabaseFixture()
-        super(PostgresDatabaseResource, self).__init__(fixture)
-
-    def reset(self, resource, result=None):
-        resource.reset()
-        return resource
-
-
-postgres_db_resource = PostgresDatabaseResource()
-
-
-class DatabaseConfig(Fixture):
-
-    def __init__(self, db_fixture):
-        super(DatabaseConfig, self).__init__()
-        self.db_fixture = db_fixture
-
-    def setUp(self):
-        super(DatabaseConfig, self).setUp()
-        self.useFixture(
-            ConfigSettings(
-                ('database', {'db_type': 'postgres',
-                              'host': self.db_fixture.cluster.datadir,
-                              'db_name': self.db_fixture.db_name,
-                              })))
-
-
-class DatabaseFixture(Fixture):
-    """Create a temporary database and make it the default.
-
-    Don't use this twice within a test, otherwise you'll get confused.
-    """
-
-    def setUp(self):
-        super(DatabaseFixture, self).setUp()
-        pg_db = self.useFixture(PostgresDatabaseFixture())
-        self.useFixture(DatabaseConfig(pg_db))
-        self.db = PackageDatabase(pg_db.conn)
-        self.addCleanup(self.db.close)
-
-
-def ConfigFileFixture(location):
-    """Use a different configuration file."""
-    return EnvironmentVariableFixture(CONF_FILE_ENV_VAR, location)
-
-
 class ConfigSettings(Fixture):
     """Use a configuration file with different settings."""
 
@@ -239,7 +102,8 @@
         tempdir = self.useFixture(TempDir())
         config_file_path = os.path.join(tempdir.path, 'test.cfg')
         write_config_file(config_file_path, self._settings)
-        self.useFixture(ConfigFileFixture(config_file_path))
+        self.useFixture(
+            EnvironmentVariableFixture(CONF_FILE_ENV_VAR, config_file_path))
 
 
 class LibdepFixture(Fixture):

=== modified file 'devportalbinary/tests/test_database.py'
--- devportalbinary/tests/test_database.py	2012-11-13 14:35:23 +0000
+++ devportalbinary/tests/test_database.py	2012-11-13 14:35:23 +0000
@@ -1,112 +1,12 @@
-import os
 
-from fixtures import TempDir
-from testresources import ResourcedTestCase
 from testtools import TestCase
-from testtools.matchers import (
-    Equals,
-    Matcher,
-    )
 
-from devportalbinary.database import (
-    get_dependency_database,
-    LibdepServiceClient,
-    load_configuration,
-    PackageDatabase,
-    )
-from devportalbinary.testing import (
-    ConfigFileFixture,
-    ConfigSettings,
-    get_libdep_service_client,
-    postgres_db_resource,
-    )
+from devportalbinary.database import LibdepServiceClient
+from devportalbinary.testing import get_libdep_service_client
 
 from libdep_service_client.client import Client
 
 
-class ResultsIn(Matcher):
-
-    def __init__(self, db, rows):
-        self._db = db
-        self._rows = rows
-
-    def match(self, query):
-        # XXX: Abstraction violation
-        results = self._db._store.execute(query)
-        return Equals(self._rows).match(list(results))
-
-
-class TestDatabase(TestCase, ResourcedTestCase):
-
-    resources = [
-            ('db_fixture', postgres_db_resource),
-            ]
-
-    def get_package_db(self):
-        db = PackageDatabase(self.db_fixture.conn)
-        self.addCleanup(db.close)
-        return db
-
-    def test_unknown_library(self):
-        db = self.get_package_db()
-        deps = db.get_multiple_dependencies(['libfoo.so.0'], 'i386')
-        self.assertEqual(deps, {})
-
-    def test_close(self):
-        # Test that we can close the package db.
-        db = PackageDatabase(self.db_fixture.conn)
-        db.close()
-
-    def test_close_twice(self):
-        # Test that we can close the package db twice with no exception.
-        db = PackageDatabase(self.db_fixture.conn)
-        db.close()
-        db.close()
-
-
-class TestDatabaseConfiguration(TestCase):
-
-    def use_database_config(self, **db_settings):
-        return self.useFixture(ConfigSettings(('database', db_settings)))
-
-    def test_get_db_info_from_config_sqlite(self):
-        other_tempdir = self.useFixture(TempDir())
-        expected_db_path = os.path.join(other_tempdir.path, 'db')
-        self.use_database_config(db_type='sqlite', path=expected_db_path)
-        options = load_configuration()
-        self.assertRaises(ValueError, PackageDatabase.get_db_info_from_config,
-                options)
-
-    def test_remote_service(self):
-        base_url = 'http://example.com/libdep-service/'
-        self.use_database_config(db_type='libdep-service', base_url=base_url)
-        db = get_dependency_database()
-        self.assertIsInstance(db, LibdepServiceClient)
-        self.assertEqual(base_url, db._client.base_url)
-
-    def test_get_db_info_from_config_postgres(self):
-        expected_username = self.getUniqueString()
-        expected_password = self.getUniqueString()
-        expected_host = self.getUniqueString()
-        expected_port = self.getUniqueInteger()
-        expected_db_name = self.getUniqueString()
-
-        self.use_database_config(
-            db_type='postgres',
-            username=expected_username,
-            password=expected_password,
-            host=expected_host,
-            port=expected_port,
-            db_name=expected_db_name)
-        options = load_configuration()
-        uri = PackageDatabase.get_db_info_from_config(options)
-        self.assertEqual(expected_db_name, uri.database)
-        self.assertEqual(expected_port, uri.port)
-        self.assertEqual(expected_host, uri.host)
-        self.assertEqual(expected_password, uri.password)
-        self.assertEqual(expected_username, uri.username)
-
-
 class TestLibdepServiceClient(TestCase):
 
     TEST_DATA = [('libfoo', {'i386': {'libfoo': 'libfoo-bin'}})]

=== modified file 'setup.py'
--- setup.py	2012-11-13 14:35:23 +0000
+++ setup.py	2012-11-13 14:35:23 +0000
@@ -18,6 +18,8 @@
     )
 from setuptools import setup, find_packages
 
+# XXX: Need to do a trawl to see if we are depending on things that we are no
+# longer using.
 
 __version__ = get_version('devportalbinary/__init__.py')