Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanups: stabilize tests and make sqlite version checks less aggressive #4852

Merged
merged 3 commits into from
Oct 11, 2021
Merged

Cleanups: stabilize tests and make sqlite version checks less aggressive #4852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dfa101
db: Ensure sqlite3 library minimum version and major version match
cdecker Sep 26, 2021
d2aa2b7
pytest: Use the same `TIMEOUT` in `wait_for_route`
cdecker Oct 8, 2021
49ea770
pyln: Add missing requirement from pyln-client to pyln-proto
cdecker Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions contrib/pyln-client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
recommonmark~=0.7
pyln-bolt7
pyln-proto
2 changes: 1 addition & 1 deletion contrib/pyln-testing/pyln/testing/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ def wait_for_channel_updates(self, scids):
+ ['Received channel_update for channel {}/1'.format(c)
for c in scids])

def wait_for_route(self, destination, timeout=30):
def wait_for_route(self, destination, timeout=TIMEOUT):
""" Wait for a route to the destination to become available.
"""
start_time = time.time()
Expand Down
7 changes: 6 additions & 1 deletion tools/headerversions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ static const char template[] =
"{\n"
" char compiled_gmp_version[100];\n"
IF_SQLITE3(
" if (SQLITE_VERSION_NUMBER != sqlite3_libversion_number())\n"
" /* Require at least the version we compiled with. */"
" if (SQLITE_VERSION_NUMBER > sqlite3_libversion_number())\n"
" errx(1, \"SQLITE version mismatch: compiled %%u, now %%u\",\n"
" SQLITE_VERSION_NUMBER, sqlite3_libversion_number());\n"
" /* Ensure the major version matches. */"
" if (SQLITE_VERSION_NUMBER + 1000000 < sqlite3_libversion_number())\n"
" errx(1, \"SQLITE major version mismatch: compiled %%u, now %%u\",\n"
" SQLITE_VERSION_NUMBER, sqlite3_libversion_number());\n"
)
" /* zlib documents that first char alters ABI. Kudos! */\n"
" if (zlibVersion()[0] != ZLIB_VERSION[0])\n"
Expand Down