Page MenuHomeSoftware Heritage
Files F7123780

D7166.id26644.diff
No OneTemporary
Actions

D7166.id26644.diff
View Options

diff --git a/swh/provenance/tests/conftest.py b/swh/provenance/tests/conftest.py
--- a/swh/provenance/tests/conftest.py
+++ b/swh/provenance/tests/conftest.py
@@ -37,7 +37,10 @@
postgresql: psycopg2.extensions.connection,
) -> Dict[str, str]:
"""return a working and initialized provenance db"""
- from swh.core.cli.db import init_admin_extensions, populate_database_for_package
+ from swh.core.db.db_utils import (
+ init_admin_extensions,
+ populate_database_for_package,
+ )
init_admin_extensions("swh.provenance", postgresql.dsn)
populate_database_for_package(
@@ -104,7 +107,10 @@
) -> Generator[ProvenanceInterface, None, None]:
"""Return a working and initialized ProvenanceInterface object"""
- from swh.core.cli.db import init_admin_extensions, populate_database_for_package
+ from swh.core.db.db_utils import (
+ init_admin_extensions,
+ populate_database_for_package,
+ )
init_admin_extensions("swh.provenance", provenance_postgresql.dsn)
populate_database_for_package(
diff --git a/swh/provenance/tests/test_cli.py b/swh/provenance/tests/test_cli.py
--- a/swh/provenance/tests/test_cli.py
+++ b/swh/provenance/tests/test_cli.py
@@ -12,8 +12,8 @@
from swh.core.cli import swh as swhmain
import swh.core.cli.db # noqa ; ensure cli is loaded
-from swh.core.cli.db import init_admin_extensions
from swh.core.db import BaseDb
+from swh.core.db.db_utils import init_admin_extensions
import swh.provenance.cli # noqa ; ensure cli is loaded
@@ -35,6 +35,7 @@
TABLES = {
"dbflavor",
+ "dbmodule",
"dbversion",
"content",
"content_in_revision",
@@ -50,7 +51,7 @@
@pytest.mark.parametrize(
- "flavor, dbtables", (("with-path", TABLES | {"location"}), ("without-path", TABLES))
+ "flavor, dbtables", (("with-path", TABLES), ("without-path", TABLES))
)
def test_cli_db_create_and_init_db_with_flavor(
monkeypatch: MonkeyPatch,

File Metadata

Mime Type
text/plain
Expires
Dec 20 2024, 1:47 AM (11 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3216314

Event Timeline

About · Developer information · Legal