heierbtc/lnbits
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to fix tests

Browse Source
This commit is contained in:
dni ⚡ 2022-10-03 22:33:26 +02:00
parent d838f6806d
commit ec0375b47c
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lnbits/settings.py
View File

@ -49,7 +49,7 @@ class Settings(BaseSettings):
default=["classic", "flamingo", "mint", "salvador", "monochrome", "autumn"] default=["classic", "flamingo", "mint", "salvador", "monochrome", "autumn"]
) )
lnbits_custom_logo: str = Field(default=None) lnbits_custom_logo: str = Field(default=None)
lnbits_ad_space: List[str] lnbits_ad_space: List[str] = Field(default=[])
# ops # ops
lnbits_data_folder: str = Field(default="./data") lnbits_data_folder: str = Field(default="./data")

2
tests/conftest.py
View File

@ -28,7 +28,7 @@ def app(event_loop):
# use redefined version of the event loop for scope="session" # use redefined version of the event loop for scope="session"
# loop = asyncio.get_event_loop() # loop = asyncio.get_event_loop()
loop = event_loop loop = event_loop
loop.run_until_complete(migrate_databases()) #loop.run_until_complete(migrate_databases())
yield app yield app
# # get the current event loop and gracefully stop any running tasks # # get the current event loop and gracefully stop any running tasks
# loop = event_loop # loop = event_loop

24
tools/conv.py
View File

@ -4,34 +4,28 @@ import sqlite3
from typing import List from typing import List
import psycopg2 import psycopg2
from environs import Env # type: ignore from lnbits.settings import settings
env = Env()
env.read_env()
# Python script to migrate an LNbits SQLite DB to Postgres # Python script to migrate an LNbits SQLite DB to Postgres
# All credits to @Fritz446 for the awesome work # All credits to @Fritz446 for the awesome work
# pip install psycopg2 OR psycopg2-binary # pip install psycopg2 OR psycopg2-binary
# Change these values as needed # Change these values as needed
sqfolder = settings.lnbits_data_folder
db_url = settings.lnbits_database_url
sqfolder = env.str("LNBITS_DATA_FOLDER", default=None) if db_url is None:
LNBITS_DATABASE_URL = env.str("LNBITS_DATABASE_URL", default=None)
if LNBITS_DATABASE_URL is None:
print("missing LNBITS_DATABASE_URL") print("missing LNBITS_DATABASE_URL")
sys.exit(1) sys.exit(1)
else: else:
# parse postgres://lnbits:postgres@localhost:5432/lnbits # parse postgres://lnbits:postgres@localhost:5432/lnbits
pgdb = LNBITS_DATABASE_URL.split("/")[-1] pgdb = db_url.split("/")[-1]
pguser = LNBITS_DATABASE_URL.split("@")[0].split(":")[-2][2:] pguser = db_url.split("@")[0].split(":")[-2][2:]
pgpswd = LNBITS_DATABASE_URL.split("@")[0].split(":")[-1] pgpswd = db_url.split("@")[0].split(":")[-1]
pghost = LNBITS_DATABASE_URL.split("@")[1].split(":")[0] pghost = db_url.split("@")[1].split(":")[0]
pgport = LNBITS_DATABASE_URL.split("@")[1].split(":")[1].split("/")[0] pgport = db_url.split("@")[1].split(":")[1].split("/")[0]
pgschema = "" pgschema = ""