From 11816d3405ec0a85ae9e2ff0139154f622546228 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Tue, 3 Oct 2023 08:12:33 +0200 Subject: [PATCH] Fix for tornado 6.3 no response in restart moment Update test results (many tests fail due to above problem) --- cps/static/js/main.js | 6 +- requirements.txt | 1 + setup.cfg | 1 + test/Calibre-Web TestSummary_Linux.html | 8243 ++++++++++++++++++++--- 4 files changed, 7258 insertions(+), 993 deletions(-) diff --git a/cps/static/js/main.js b/cps/static/js/main.js index 8d7354ef..aba21371 100644 --- a/cps/static/js/main.js +++ b/cps/static/js/main.js @@ -333,7 +333,6 @@ $(function() { } else { $("#parent").addClass('hidden') } - // console.log(data); data.files.forEach(function(entry) { if(entry.type === "dir") { var type = ""; @@ -398,6 +397,11 @@ $(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/requirements.txt b/requirements.txt index b12424cc..e384ed87 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +Werkzeug<3.0.0 APScheduler>=3.6.3,<3.11.0 Babel>=1.3,<3.0 Flask-Babel>=0.11.1,<3.2.0 diff --git a/setup.cfg b/setup.cfg index d4deb399..e64c2f05 100644 --- a/setup.cfg +++ b/setup.cfg @@ -57,6 +57,7 @@ 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 77b834cc..704ef359 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2023-08-30 20:29:50

+

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

-

Stop Time: 2023-08-31 03:01:14

+

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

-

Duration: 5h 31 min

+

Duration: 3h 41 min

@@ -234,12 +234,12 @@ - + TestBackupMetadata 22 - 22 - 0 + 2 0 + 20 0 Detail @@ -248,29 +248,125 @@ - +
TestBackupMetadata - test_backup_all
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_author
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_description
- PASS + +
+ ERROR +
+ + + + @@ -284,146 +380,754 @@ - +
TestBackupMetadata - test_backup_change_book_language
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_publisher
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_publishing_date
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_rating
- PASS - - - - - - -
TestBackupMetadata - test_backup_change_book_series_index
+ +
+ ERROR +
+ + + - PASS - + + +
TestBackupMetadata - test_backup_change_book_seriesindex
+ + +
+ ERROR +
+ + + + + + + + +
TestBackupMetadata - test_backup_change_book_tags
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_book_title
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_Comment
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_Enum
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_bool
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_categories
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_date
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_float
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_int
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_rating
- PASS + +
+ ERROR +
+ + + + - +
TestBackupMetadata - test_backup_change_custom_text
- PASS + +
+ ERROR +
+ + + + @@ -437,23 +1141,54 @@ - +
TestBackupMetadata - test_upload_book
- PASS + +
+ ERROR +
+ + + + - + TestBackupMetadataGdrive 1 + 0 + 0 1 0 - 0 - 0 Detail @@ -461,22 +1196,60 @@ - +
TestBackupMetadataGdrive - test_backup_gdrive
- PASS + +
+ ERROR +
+ + + + - + TestCli 13 - 13 - 0 - 0 + 10 + 2 + 1 0 Detail @@ -566,20 +1339,60 @@ - +
TestCli - test_logfile
- PASS + +
+ FAIL +
+ + + + - +
TestCli - test_no_database
- PASS + +
+ FAIL +
+ + + + @@ -593,11 +1406,44 @@ - +
TestCli - test_writeonly_static_files
- PASS + +
+ ERROR +
+ + + + @@ -711,11 +1557,11 @@ - + TestEbookConvertCalibre 15 - 15 - 0 + 14 + 1 0 0 @@ -725,11 +1571,31 @@ - +
TestEbookConvertCalibre - test_calibre_log
- PASS + +
+ FAIL +
+ + + + @@ -861,39 +1727,132 @@ - + TestEbookConvertCalibreGDrive - 6 - 6 - 0 - 0 + 7 + 4 + 1 + 2 0 - Detail + Detail - +
TestEbookConvertCalibreGDrive - test_convert_email
- PASS + +
+ ERROR +
+ + + + - + + +
TestEbookConvertCalibreGDrive - test_convert_email
+ + +
+ ERROR +
+ + + + + + + + +
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
- PASS + +
+ FAIL +
+ + + + - +
TestEbookConvertCalibreGDrive - test_convert_only
@@ -902,7 +1861,7 @@ - +
TestEbookConvertCalibreGDrive - test_convert_parameter
@@ -911,7 +1870,7 @@ - +
TestEbookConvertCalibreGDrive - test_email_failed
@@ -920,7 +1879,7 @@ - +
TestEbookConvertCalibreGDrive - test_email_only
@@ -972,11 +1931,11 @@ - + TestEbookConvertGDriveKepubify 3 - 3 - 0 + 2 + 1 0 0 @@ -995,11 +1954,33 @@ - +
TestEbookConvertGDriveKepubify - test_convert_only
- PASS + +
+ FAIL +
+ + + + @@ -1014,12 +1995,12 @@ - + TestEditAdditionalBooks 20 - 18 - 0 - 0 + 11 + 2 + 5 2 Detail @@ -1028,29 +2009,111 @@ - +
TestEditAdditionalBooks - test_cbz_comicinfo
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_change_upload_formats
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_delete_book
- PASS + +
+ FAIL +
+ + + + @@ -1109,11 +2172,31 @@ - +
TestEditAdditionalBooks - test_title_sort
- PASS + +
+ FAIL +
+ + + + @@ -1189,11 +2272,44 @@ - +
TestEditAdditionalBooks - test_writeonly_path
- PASS + +
+ ERROR +
+ + + + @@ -1207,20 +2323,887 @@ - +
TestEditAdditionalBooks - test_xss_comment_edit
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_xss_custom_comment_edit
- PASS + +
+ ERROR +
+ + + + + + + + + + + _ErrorHolder + 10 + 0 + 0 + 10 + 0 + + Detail + + + + + + + +
tearDownClass (test_edit_additional_books)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_goodreads)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_kobo_sync)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_kobo_sync_big)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_limiter)
+ + +
+ ERROR +
+ + + + + + + + + + +
setUpClass (test_logging)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_pdf_metadata)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_register)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_upload_epubs)
+ + +
+ ERROR +
+ + + + + + + + + + +
tearDownClass (test_user_load)
+ + +
+ ERROR +
+ + + + @@ -1234,13 +3217,13 @@ 0 2 - Detail + Detail - +
TestEditBooks - test_download_book
@@ -1249,7 +3232,7 @@ - +
TestEditBooks - test_edit_author
@@ -1258,7 +3241,7 @@ - +
TestEditBooks - test_edit_category
@@ -1267,7 +3250,7 @@ - +
TestEditBooks - test_edit_comments
@@ -1276,7 +3259,7 @@ - +
TestEditBooks - test_edit_custom_bool
@@ -1285,7 +3268,7 @@ - +
TestEditBooks - test_edit_custom_categories
@@ -1294,7 +3277,7 @@ - +
TestEditBooks - test_edit_custom_comment
@@ -1303,7 +3286,7 @@ - +
TestEditBooks - test_edit_custom_date
@@ -1312,7 +3295,7 @@ - +
TestEditBooks - test_edit_custom_float
@@ -1321,7 +3304,7 @@ - +
TestEditBooks - test_edit_custom_int
@@ -1330,7 +3313,7 @@ - +
TestEditBooks - test_edit_custom_rating
@@ -1339,7 +3322,7 @@ - +
TestEditBooks - test_edit_custom_single_select
@@ -1348,7 +3331,7 @@ - +
TestEditBooks - test_edit_custom_text
@@ -1357,7 +3340,7 @@ - +
TestEditBooks - test_edit_language
@@ -1366,7 +3349,7 @@ - +
TestEditBooks - test_edit_publisher
@@ -1375,7 +3358,7 @@ - +
TestEditBooks - test_edit_publishing_date
@@ -1384,7 +3367,7 @@ - +
TestEditBooks - test_edit_rating
@@ -1393,7 +3376,7 @@ - +
TestEditBooks - test_edit_series
@@ -1402,7 +3385,7 @@ - +
TestEditBooks - test_edit_title
@@ -1411,19 +3394,19 @@ - +
TestEditBooks - test_rename_upper_lowercase
- SKIP + SKIP
-