From 7ed56b4397c72a9d9f3eed149c4728d613a26228 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 8 Oct 2023 15:46:51 +0200 Subject: [PATCH] Better fix for new tornado version --- cps/server.py | 3 +- cps/static/js/main.js | 5 - setup.cfg | 2 +- test/Calibre-Web TestSummary_Linux.html | 7782 +++-------------------- 4 files changed, 909 insertions(+), 6883 deletions(-) diff --git a/cps/server.py b/cps/server.py index ed3b7716..8a740b28 100644 --- a/cps/server.py +++ b/cps/server.py @@ -288,4 +288,5 @@ class WebServer(object): if _GEVENT: self.wsgiserver.close() else: - self.wsgiserver.add_callback_from_signal(self.wsgiserver.stop) + self.wsgiserver.call_later(1.0, self.wsgiserver.stop) + # self.wsgiserver.add_callback() diff --git a/cps/static/js/main.js b/cps/static/js/main.js index aba21371..34d3bc96 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -397,11 +397,6 @@ $(function() { success: function success() { $("#spinner").show(); setTimeout(restartTimer, 3000); - }, - error: function (xhr) { - // Fix for new tornado versions , not returning a response during restart - $("#spinner").show(); - setTimeout(restartTimer, 3000); } }); }); diff --git a/setup.cfg b/setup.cfg index e64c2f05..11703785 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,6 +38,7 @@ console_scripts = [options] include_package_data = True install_requires = + Werkzeug<3.0.0 APScheduler>=3.6.3,<3.11.0 Babel>=1.3,<3.0 Flask-Babel>=0.11.1,<3.2.0 @@ -57,7 +58,6 @@ install_requires = chardet>=3.0.0,<4.1.0 advocate>=1.0.0,<1.1.0 Flask-Limiter>=2.3.0,<3.5.0 - werkzeug<3.0.0 [options.extras_require] diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 704ef359..a1676791 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2023-10-02 20:08:55

+

Start Time: 2023-10-05 14:17:33

-

Stop Time: 2023-10-03 00:53:46

+

Stop Time: 2023-10-05 20:50:36

-

Duration: 3h 41 min

+

Duration: 5h 26 min

@@ -234,12 +234,12 @@ - + TestBackupMetadata 22 - 2 + 22 + 0 0 - 20 0 Detail @@ -248,125 +248,29 @@ - +
TestBackupMetadata - test_backup_all
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_author
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_description
- -
- ERROR -
- - - - + PASS @@ -380,754 +284,146 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild - +
TestBackupMetadata - test_backup_change_book_language
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_publisher
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_publishing_date
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_rating
- -
- ERROR -
- - - - + PASS - + -
TestBackupMetadata - test_backup_change_book_seriesindex
- - -
- ERROR -
- - - +
TestBackupMetadata - test_backup_change_book_series_index
+ PASS - +
TestBackupMetadata - test_backup_change_book_tags
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_book_title
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_Comment
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_Enum
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_bool
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_categories
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_date
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_float
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_int
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_rating
- -
- ERROR -
- - - - + PASS - +
TestBackupMetadata - test_backup_change_custom_text
- -
- ERROR -
- - - - + PASS @@ -1141,54 +437,23 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild - +
TestBackupMetadata - test_upload_book
- -
- ERROR -
- - - - + PASS - + TestBackupMetadataGdrive 1 - 0 - 0 1 0 + 0 + 0 Detail @@ -1196,49 +461,11 @@ dom.find/</<@chrome://remote/content/shared/DOM.sys.mjs:132:16 - +
TestBackupMetadataGdrive - test_backup_gdrive
- -
- ERROR -
- - - - + PASS @@ -1247,8 +474,8 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild TestCli 13 - 10 - 2 + 9 + 3 1 0 @@ -1276,20 +503,92 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild - +
TestCli - test_change_password
- PASS + +
+ FAIL +
+ + + + - +
TestCli - test_cli_SSL_files
- PASS + +
+ FAIL +
+ + + + @@ -1303,11 +602,45 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild - +
TestCli - test_cli_different_settings_database
- PASS + +
+ ERROR +
+ + + + @@ -1339,106 +672,60 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild - +
TestCli - test_logfile
- -
- FAIL -
- - - - - - - - - - -
TestCli - test_no_database
- - -
- FAIL -
- - - - - - - - - - -
TestCli - test_settingsdb_not_writeable
- PASS - + -
TestCli - test_writeonly_static_files
+
TestCli - test_no_database
+ + PASS + + + + + + +
TestCli - test_settingsdb_not_writeable
- ERROR + FAIL
-