diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ include_package_data=True, entry_points=""" [swh.cli.subcommands] - content-replayer=swh.objstorage.replayer.cli:cli + content-replayer=swh.objstorage.replayer.cli:objstorage_group """, classifiers=[ "Programming Language :: Python :: 3", diff --git a/swh/objstorage/replayer/cli.py b/swh/objstorage/replayer/cli.py --- a/swh/objstorage/replayer/cli.py +++ b/swh/objstorage/replayer/cli.py @@ -16,14 +16,14 @@ from swh.model.model import SHA1_SIZE from swh.journal.client import get_journal_client -from swh.objstorage.cli import cli +from swh.objstorage.cli import cli as objstorage_group from swh.objstorage.factory import get_objstorage from swh.objstorage.replayer.replay import is_hash_in_bytearray from swh.objstorage.replayer.replay import process_replay_objects_content -@cli.command("replay") +@objstorage_group.command("replay") @click.option( "--stop-after-objects", "-n", @@ -126,7 +126,7 @@ def main(): logging.basicConfig() - return cli(auto_envvar_prefix="SWH_OBJSTORAGE") + return objstorage_group(auto_envvar_prefix="SWH_OBJSTORAGE") if __name__ == "__main__": diff --git a/swh/objstorage/replayer/tests/test_cli.py b/swh/objstorage/replayer/tests/test_cli.py --- a/swh/objstorage/replayer/tests/test_cli.py +++ b/swh/objstorage/replayer/tests/test_cli.py @@ -21,7 +21,7 @@ from swh.journal.serializers import key_to_kafka from swh.model.hashutil import hash_to_hex from swh.objstorage.backends.in_memory import InMemoryObjStorage -from swh.objstorage.replayer.cli import cli +from swh.objstorage.replayer.cli import objstorage_group from swh.objstorage.replayer.replay import CONTENT_REPLAY_RETRIES @@ -71,7 +71,9 @@ yaml.dump(config, config_fd) config_fd.seek(0) args = ["-C" + config_fd.name] + list(args) - return runner.invoke(cli, args, obj={"log_level": logging.DEBUG}, env=env,) + return runner.invoke( + objstorage_group, args, obj={"log_level": logging.DEBUG}, env=env, + ) def test_replay_help():