diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (C) 2015-2018 The Software Heritage developers +# Copyright (C) 2015-2020 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information @@ -53,6 +53,8 @@ swh-storage=swh.storage.cli:main [swh.cli.subcommands] storage=swh.storage.cli:storage + [pytest11] + pytest_swh_storage=swh.storage.pytest_plugin """, install_requires=parse_requirements() + parse_requirements("swh"), extras_require={ diff --git a/swh/storage/tests/conftest.py b/swh/storage/pytest_plugin.py copy from swh/storage/tests/conftest.py copy to swh/storage/pytest_plugin.py --- a/swh/storage/tests/conftest.py +++ b/swh/storage/pytest_plugin.py @@ -1,51 +1,23 @@ -# Copyright (C) 2019 The Software Heritage developers +# Copyright (C) 2019-2020 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import glob -import pytest -import multiprocessing.util -from typing import Union from os import path, environ -from hypothesis import settings -from typing import Dict +from typing import Union -try: - import pytest_cov.embed -except ImportError: - pytest_cov = None +import pytest + +import swh.storage from pytest_postgresql import factories from pytest_postgresql.janitor import DatabaseJanitor, psycopg2, Version -import swh.storage - from swh.core.utils import numfile_sortkey as sortkey -from swh.model.tests.generate_testdata import gen_contents, gen_origins -from swh.model.model import ( - Content, - Directory, - Origin, - OriginVisit, - Release, - Revision, - SkippedContent, - Snapshot, -) - +from swh.storage import get_storage -OBJECT_FACTORY = { - "content": Content.from_dict, - "directory": Directory.from_dict, - "origin": Origin.from_dict, - "origin_visit": OriginVisit.from_dict, - "release": Release.from_dict, - "revision": Revision.from_dict, - "skipped_content": SkippedContent.from_dict, - "snapshot": Snapshot.from_dict, -} SQL_DIR = path.join(path.dirname(swh.storage.__file__), "sql") @@ -53,26 +25,6 @@ DUMP_FILES = path.join(SQL_DIR, "*.sql") -# define tests profile. Full documentation is at: -# https://hypothesis.readthedocs.io/en/latest/settings.html#settings-profiles -settings.register_profile("fast", max_examples=5, deadline=5000) -settings.register_profile("slow", max_examples=20, deadline=5000) - - -if pytest_cov is not None: - # pytest_cov + multiprocessing can cause a segmentation fault when starting - # the child process ; so we're - # removing pytest-coverage's hook that runs when a child process starts. - # This means code run in child processes won't be counted in the coverage - # report, but this is not an issue because the only code that runs only in - # child processes is the RPC server. - for (key, value) in multiprocessing.util._afterfork_registry.items(): - if value is pytest_cov.embed.multiprocessing_start: - del multiprocessing.util._afterfork_registry[key] - break - else: - assert False, "missing pytest_cov.embed.multiprocessing_start?" - @pytest.fixture def swh_storage_backend_config(postgresql_proc, swh_storage_postgresql): @@ -91,22 +43,7 @@ @pytest.fixture def swh_storage(swh_storage_backend_config): - return swh.storage.get_storage(cls="validate", storage=swh_storage_backend_config) - - -@pytest.fixture -def swh_contents(swh_storage): - contents = gen_contents(n=20) - swh_storage.content_add([c for c in contents if c["status"] != "absent"]) - swh_storage.skipped_content_add([c for c in contents if c["status"] == "absent"]) - return contents - - -@pytest.fixture -def swh_origins(swh_storage): - origins = gen_origins(n=100) - swh_storage.origin_add(origins) - return origins + return get_storage(cls="validate", storage=swh_storage_backend_config) # the postgres_fact factory fixture below is mostly a copy of the code @@ -243,30 +180,3 @@ "WHERE pg_stat_activity.datname = %s;".format(pid_column), (self.db_name,), ) - - -@pytest.fixture -def sample_data() -> Dict: - """Pre-defined sample storage object data to manipulate - - Returns: - Dict of data (keys: content, directory, revision, release, person, - origin) - - """ - from .storage_data import data - - return { - "content": [data.cont, data.cont2], - "content_metadata": [data.cont3], - "skipped_content": [data.skipped_cont, data.skipped_cont2], - "person": [data.person], - "directory": [data.dir2, data.dir], - "revision": [data.revision, data.revision2, data.revision3], - "release": [data.release, data.release2, data.release3], - "snapshot": [data.snapshot], - "origin": [data.origin, data.origin2], - "fetcher": [data.metadata_fetcher], - "authority": [data.metadata_authority], - "origin_metadata": [data.origin_metadata, data.origin_metadata2], - } diff --git a/swh/storage/tests/conftest.py b/swh/storage/tests/conftest.py --- a/swh/storage/tests/conftest.py +++ b/swh/storage/tests/conftest.py @@ -3,12 +3,9 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -import glob import pytest import multiprocessing.util -from typing import Union -from os import path, environ from hypothesis import settings from typing import Dict @@ -17,12 +14,7 @@ except ImportError: pytest_cov = None -from pytest_postgresql import factories -from pytest_postgresql.janitor import DatabaseJanitor, psycopg2, Version -import swh.storage - -from swh.core.utils import numfile_sortkey as sortkey from swh.model.tests.generate_testdata import gen_contents, gen_origins from swh.model.model import ( Content, @@ -47,11 +39,6 @@ "snapshot": Snapshot.from_dict, } -SQL_DIR = path.join(path.dirname(swh.storage.__file__), "sql") - -environ["LC_ALL"] = "C.UTF-8" - -DUMP_FILES = path.join(SQL_DIR, "*.sql") # define tests profile. Full documentation is at: # https://hypothesis.readthedocs.io/en/latest/settings.html#settings-profiles @@ -74,26 +61,6 @@ assert False, "missing pytest_cov.embed.multiprocessing_start?" -@pytest.fixture -def swh_storage_backend_config(postgresql_proc, swh_storage_postgresql): - yield { - "cls": "local", - "db": "postgresql://{user}@{host}:{port}/{dbname}".format( - host=postgresql_proc.host, - port=postgresql_proc.port, - user="postgres", - dbname="tests", - ), - "objstorage": {"cls": "memory", "args": {}}, - "journal_writer": {"cls": "memory",}, - } - - -@pytest.fixture -def swh_storage(swh_storage_backend_config): - return swh.storage.get_storage(cls="validate", storage=swh_storage_backend_config) - - @pytest.fixture def swh_contents(swh_storage): contents = gen_contents(n=20) @@ -109,142 +76,6 @@ return origins -# the postgres_fact factory fixture below is mostly a copy of the code -# from pytest-postgresql. We need a custom version here to be able to -# specify our version of the DBJanitor we use. -def postgresql_fact(process_fixture_name, db_name=None, dump_files=DUMP_FILES): - @pytest.fixture - def postgresql_factory(request): - """ - Fixture factory for PostgreSQL. - - :param FixtureRequest request: fixture request object - :rtype: psycopg2.connection - :returns: postgresql client - """ - config = factories.get_config(request) - if not psycopg2: - raise ImportError("No module named psycopg2. Please install it.") - proc_fixture = request.getfixturevalue(process_fixture_name) - - # _, config = try_import('psycopg2', request) - pg_host = proc_fixture.host - pg_port = proc_fixture.port - pg_user = proc_fixture.user - pg_options = proc_fixture.options - pg_db = db_name or config["dbname"] - with SwhDatabaseJanitor( - pg_user, - pg_host, - pg_port, - pg_db, - proc_fixture.version, - dump_files=dump_files, - ): - connection = psycopg2.connect( - dbname=pg_db, - user=pg_user, - host=pg_host, - port=pg_port, - options=pg_options, - ) - yield connection - connection.close() - - return postgresql_factory - - -swh_storage_postgresql = postgresql_fact("postgresql_proc") - - -# This version of the DatabaseJanitor implement a different setup/teardown -# behavior than than the stock one: instead of dropping, creating and -# initializing the database for each test, it create and initialize the db only -# once, then it truncate the tables. This is needed to have acceptable test -# performances. -class SwhDatabaseJanitor(DatabaseJanitor): - def __init__( - self, - user: str, - host: str, - port: str, - db_name: str, - version: Union[str, float, Version], - dump_files: str = DUMP_FILES, - ) -> None: - super().__init__(user, host, port, db_name, version) - self.dump_files = sorted(glob.glob(dump_files), key=sortkey) - - def db_setup(self): - with psycopg2.connect( - dbname=self.db_name, user=self.user, host=self.host, port=self.port, - ) as cnx: - with cnx.cursor() as cur: - for fname in self.dump_files: - with open(fname) as fobj: - sql = fobj.read().replace("concurrently", "").strip() - if sql: - cur.execute(sql) - cnx.commit() - - def db_reset(self): - with psycopg2.connect( - dbname=self.db_name, user=self.user, host=self.host, port=self.port, - ) as cnx: - with cnx.cursor() as cur: - cur.execute( - "SELECT table_name FROM information_schema.tables " - "WHERE table_schema = %s", - ("public",), - ) - tables = set(table for (table,) in cur.fetchall()) - for table in tables: - cur.execute("truncate table %s cascade" % table) - - cur.execute( - "SELECT sequence_name FROM information_schema.sequences " - "WHERE sequence_schema = %s", - ("public",), - ) - seqs = set(seq for (seq,) in cur.fetchall()) - for seq in seqs: - cur.execute("ALTER SEQUENCE %s RESTART;" % seq) - cnx.commit() - - def init(self): - with self.cursor() as cur: - cur.execute( - "SELECT COUNT(1) FROM pg_database WHERE datname=%s;", (self.db_name,) - ) - db_exists = cur.fetchone()[0] == 1 - if db_exists: - cur.execute( - "UPDATE pg_database SET datallowconn=true " "WHERE datname = %s;", - (self.db_name,), - ) - - if db_exists: - self.db_reset() - else: - with self.cursor() as cur: - cur.execute('CREATE DATABASE "{}";'.format(self.db_name)) - self.db_setup() - - def drop(self): - pid_column = "pid" - with self.cursor() as cur: - cur.execute( - "UPDATE pg_database SET datallowconn=false " "WHERE datname = %s;", - (self.db_name,), - ) - cur.execute( - "SELECT pg_terminate_backend(pg_stat_activity.{})" - "FROM pg_stat_activity " - "WHERE pg_stat_activity.datname = %s;".format(pid_column), - (self.db_name,), - ) - - @pytest.fixture def sample_data() -> Dict: """Pre-defined sample storage object data to manipulate