From 23033255b81a889b568d8bfa3de2c80dc6269fac Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Tue, 12 Dec 2023 18:15:48 +0100 Subject: [PATCH] Bugfix updater --- cps/updater.py | 2 +- test/Calibre-Web TestSummary_Linux.html | 5926 ++--------------------- 2 files changed, 517 insertions(+), 5411 deletions(-) diff --git a/cps/updater.py b/cps/updater.py index 8150aa0d..67b3653f 100644 --- a/cps/updater.py +++ b/cps/updater.py @@ -566,7 +566,7 @@ class Updater(threading.Thread): try: current_version[2] = int(current_version[2]) except ValueError: - current_version[2] = int(current_version[2].split(' ')[0])-1 + current_version[2] = int(current_version[2].replace("b", "").split(' ')[0])-1 # Check if major versions are identical search for newest non-equal commit and update to this one if major_version_update == current_version[0]: diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 03883e3b..578633d8 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2023-12-10 09:21:07

+

Start Time: 2023-12-11 14:38:27

-

Stop Time: 2023-12-10 14:53:07

+

Stop Time: 2023-12-11 22:35:21

-

Duration: 4h 31 min

+

Duration: 5h 37 min

@@ -852,12 +852,12 @@ - + TestEbookConvertCalibreGDrive 6 - 4 - 1 - 1 + 6 + 0 + 0 0 Detail @@ -866,62 +866,20 @@ - +
TestEbookConvertCalibreGDrive - test_convert_email
- -
- ERROR -
- - - - + PASS - +
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
- -
- FAIL -
- - - - + PASS @@ -1989,11 +1947,11 @@ AssertionError: 'Finished' != 'Started' - + TestEditBooksOnGdrive 18 - 18 - 0 + 17 + 1 0 0 @@ -2156,11 +2114,31 @@ AssertionError: 'Finished' != 'Started' - +
TestEditBooksOnGdrive - test_watch_metadata
- PASS + +
+ FAIL +
+ + + + @@ -2824,10 +2802,12 @@ urllib3.exceptions.LocationParseError: Failed to parse: http://127.0.0.1:{}/opds During handling of the above exception, another exception occurred: Traceback (most recent call last): - File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 969, in test_ldap_opds_anonymous - r = req_session.get('http://127.0.0.1:{}' + entries['elements'][0]['download']) - File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/requests/sessions.py", line 602, in get - return self.request("GET", url, **kwargs) + File "/home/ozzie/Development/calibre-web-test/test/test_ldap.py", line 985, in test_ldap_opds_anonymous + r = requests.get('http://127.0.0.1:{}' + entries['elements'][0]['download']) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/requests/api.py", line 73, in get + return request("get", url, params=params, **kwargs) + File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/requests/api.py", line 59, in request + return session.request(method=method, url=url, **kwargs) File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/requests/sessions.py", line 575, in request prep = self.prepare_request(req) File "/home/ozzie/Development/calibre-web-test/venv/lib/python3.10/site-packages/requests/sessions.py", line 486, in prepare_request @@ -3043,13 +3023,13 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - + TestLogging 9 - 8 - 0 + 7 0 1 + 1 Detail @@ -3146,11 +3126,113 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogging - test_logviewer
- PASS + +
+ ERROR +
+ + + + + + + + + + + _ErrorHolder + 1 + 0 + 0 + 1 + 0 + + Detail + + + + + + + +
tearDownClass (test_logging)
+ + +
+ ERROR +
+ + + + @@ -3164,13 +3246,13 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 0 0 - Detail + Detail - +
TestLogin - test_digest_login
@@ -3179,7 +3261,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_capital_letters_user_unicode_password
@@ -3188,7 +3270,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_cookie_steal
@@ -3197,7 +3279,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_delete_admin
@@ -3206,7 +3288,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_empty_password
@@ -3215,7 +3297,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_locale_select
@@ -3224,7 +3306,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_protected
@@ -3233,7 +3315,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_remember_me
@@ -3242,7 +3324,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_rename_user
@@ -3251,7 +3333,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_unicode_user_space_end_password
@@ -3260,7 +3342,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_login_user_with_space_password_end_space
@@ -3269,7 +3351,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_magic_remote_login
@@ -3278,7 +3360,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_next
@@ -3287,7 +3369,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_password_policy
@@ -3296,7 +3378,7 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_proxy_login
@@ -3305,19 +3387,19 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestLogin - test_proxy_login_multi_user
- FAIL + FAIL
-