From a97f298586bc7b98d694201f3d20edd639be3ac2 Mon Sep 17 00:00:00 2001 From: jackstar12 <62219658+jackstar12@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:21:05 +0200 Subject: [PATCH] [TEST] use test data as mockdata (#1929) * add db group to cli * delete mock_data.zip * generate migration data through tests --- Makefile | 9 ++++----- lnbits/commands.py | 26 ++++++++++++++------------ tests/data/mock_data.zip | Bin 6827 -> 0 bytes 3 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 tests/data/mock_data.zip diff --git a/Makefile b/Makefile index b1e2b4f6..dca550d0 100644 --- a/Makefile +++ b/Makefile @@ -48,18 +48,17 @@ test-real-wallet: poetry run pytest test-migration: - rm -rf ./migration-data - mkdir -p ./migration-data - unzip tests/data/mock_data.zip -d ./migration-data + LNBITS_ADMIN_UI=True \ + make test HOST=0.0.0.0 \ PORT=5002 \ - LNBITS_DATA_FOLDER="./migration-data" \ + LNBITS_DATA_FOLDER="./tests/data" \ timeout 5s poetry run lnbits --host 0.0.0.0 --port 5002 || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi HOST=0.0.0.0 \ PORT=5002 \ LNBITS_DATABASE_URL="postgres://lnbits:lnbits@localhost:5432/migration" \ timeout 5s poetry run lnbits --host 0.0.0.0 --port 5002 || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - LNBITS_DATA_FOLDER="./migration-data" \ + LNBITS_DATA_FOLDER="./tests/data" \ LNBITS_DATABASE_URL="postgres://lnbits:lnbits@localhost:5432/migration" \ poetry run python tools/conv.py diff --git a/lnbits/commands.py b/lnbits/commands.py index f8f396dc..3dcab0f2 100644 --- a/lnbits/commands.py +++ b/lnbits/commands.py @@ -15,31 +15,38 @@ from .extension_manager import get_valid_extensions @click.group() -def command_group(): +def lnbits_cli(): """ Python CLI for LNbits """ +@lnbits_cli.group() +def db(): + """ + Database related commands + """ + + def get_super_user() -> str: """Get the superuser""" with open(Path(settings.lnbits_data_folder) / ".super_user", "r") as file: return file.readline() -@click.command("superuser") +@lnbits_cli.command("superuser") def superuser(): """Prints the superuser""" click.echo(get_super_user()) -@click.command("superuser-url") +@lnbits_cli.command("superuser-url") def superuser_url(): """Prints the superuser""" click.echo(f"http://{settings.host}:{settings.port}/wallet?usr={get_super_user()}") -@click.command("delete-settings") +@lnbits_cli.command("delete-settings") def delete_settings(): """Deletes the settings""" @@ -51,7 +58,7 @@ def delete_settings(): loop.run_until_complete(wrap()) -@click.command("database-migrate") +@db.command("migrate") def database_migrate(): """Migrate databases""" loop = asyncio.get_event_loop() @@ -91,7 +98,7 @@ async def migrate_databases(): logger.info("✔️ All migrations done.") -@click.command("database-versions") +@db.command("versions") def database_versions(): """Show current database versions""" loop = asyncio.get_event_loop() @@ -112,12 +119,7 @@ async def load_disabled_extension_list() -> None: def main(): """main function""" - command_group.add_command(superuser) - command_group.add_command(superuser_url) - command_group.add_command(delete_settings) - command_group.add_command(database_migrate) - command_group.add_command(database_versions) - command_group() + lnbits_cli() if __name__ == "__main__": diff --git a/tests/data/mock_data.zip b/tests/data/mock_data.zip deleted file mode 100644 index e8039b2f7676a867f0ea84ce3a5e9aac3bc12245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6827 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