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 b1e2b4f68..dca550d04 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 f8f396dc6..3dcab0f2b 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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 CXJMBB