diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py index c579c85e..faa3f8fd 100644 --- a/cps/oauth_bb.py +++ b/cps/oauth_bb.py @@ -42,6 +42,7 @@ except NameError: oauth_check = {} +oauthblueprints = [] oauth = Blueprint('oauth', __name__) log = logger.create() @@ -203,7 +204,6 @@ def unlink_oauth(provider): return redirect(url_for('web.profile')) def generate_oauth_blueprints(): - oauthblueprints = [] if not ub.session.query(ub.OAuthProvider).count(): for provider in ("github", "google"): oauthProvider = ub.OAuthProvider() diff --git a/cps/static/js/main.js b/cps/static/js/main.js index 834b9b30..c1e8f754 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -222,7 +222,7 @@ $(function() { function updateTimer() { $.ajax({ dataType: "json", - url: window.location.pathname + "/get_updater_status", + url: window.location.pathname + "/../../get_updater_status", success: function success(data) { // console.log(data.status); $("#DialogContent").html(updateText[data.status]); diff --git a/cps/ub.py b/cps/ub.py index 2031a597..6cbc0383 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -31,12 +31,12 @@ from flask_login import AnonymousUserMixin, current_user try: from flask_dance.consumer.backend.sqla import OAuthConsumerMixin oauth_support = True -except ImportError: +except ImportError as e: # fails on flask-dance >1.3, due to renaming try: from flask_dance.consumer.storage.sqla import OAuthConsumerMixin oauth_support = True - except ImportError: + except ImportError as e: oauth_support = False from sqlalchemy import create_engine, exc, exists, event, text from sqlalchemy import Column, ForeignKey diff --git a/requirements.txt b/requirements.txt index ca11eff9..8919afd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ iso-639>=0.4.5,<0.5.0 PyPDF3>=1.0.0,<1.0.4 pytz>=2016.10 requests>=2.11.1,<2.25.0 -SQLAlchemy>=1.3.0,<1.5.0 +SQLAlchemy>=1.3.0,<1.5.0 # oauth fails on 1.4+ due to import problems in flask_dance tornado>=4.1,<6.2 Wand>=0.4.4,<0.7.0 unidecode>=0.04.19,<1.2.0 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 7a88f553..71b15e69 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2021-03-22 19:04:38

+

Start Time: 2021-03-23 19:05:31

-

Stop Time: 2021-03-22 21:16:53

+

Stop Time: 2021-03-23 21:31:07

-

Duration: 1h 43 min

+

Duration: 1h 57 min

@@ -386,11 +386,11 @@ - + TestEbookConvertCalibre 11 - 11 - 0 + 10 + 1 0 0 @@ -463,11 +463,33 @@ - +
TestEbookConvertCalibre - test_email_only
- PASS + +
+ FAIL +
+ + + + @@ -653,12 +675,12 @@ - + TestEditAdditionalBooks 13 - 5 - 2 - 5 + 12 + 0 + 0 1 Detail @@ -667,31 +689,11 @@ - +
TestEditAdditionalBooks - test_change_upload_formats
- -
- FAIL -
- - - - + PASS @@ -705,31 +707,11 @@ AssertionError: False is not true - +
TestEditAdditionalBooks - test_delete_role
- -
- FAIL -
- - - - + PASS @@ -770,138 +752,38 @@ AssertionError: False is not true - +
TestEditAdditionalBooks - test_title_sort
- -
- ERROR -
- - - - + PASS - +
TestEditAdditionalBooks - test_upload_edit_role
- -
- ERROR -
- - - - + PASS - +
TestEditAdditionalBooks - test_upload_metadata_cbr
- -
- ERROR -
- - - - + PASS - +
TestEditAdditionalBooks - test_upload_metadata_cbt
- -
- ERROR -
- - - - + PASS @@ -932,325 +814,50 @@ selenium.common.exceptions.TimeoutException: Message: - +
TestEditAdditionalBooks - test_writeonly_path
- -
- ERROR -
- - - - + PASS - - _ErrorHolder - 6 - 0 - 0 - 6 - 0 - - Detail - - - - - - - -
tearDownClass (test_edit_additional_books)
- - -
- ERROR -
- - - - - - - - - - -
tearDownClass (test_edit_books)
- - -
- ERROR -
- - - - - - - - - - -
tearDownClass (test_email_ssl)
- - -
- ERROR -
- - - - - - - - - - -
tearDownClass (test_ldap)
- - -
- ERROR -
- - - - - - - - - - -
tearDownClass (test_pdf_metadata)
- - -
- ERROR -
- - - - - - - - - - -
tearDownClass (test_reader)
- - -
- ERROR -
- - - - - - - - - - + TestEditBooks 33 - 12 - 4 - 15 + 30 + 1 + 0 2 - Detail + Detail - +
TestEditBooks - test_download_book
- FAIL + FAIL
-