From 21ebdc01303d751aa4fc8cd82781c16ae9907245 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Tue, 26 Apr 2022 10:49:06 +0200 Subject: [PATCH] Bugfixes from testrun --- cps/admin.py | 4 +- cps/schedule.py | 2 +- test/Calibre-Web TestSummary_Linux.html | 2724 ++++++++++++----------- 3 files changed, 1367 insertions(+), 1363 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 9dc45096..73442ef2 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -1684,12 +1684,12 @@ def edit_scheduledtasks(): def update_scheduledtasks(): error = False to_save = request.form.to_dict() - if "0" <= to_save.get("schedule_start_time") <= "23": + if 0 <= int(to_save.get("schedule_start_time")) <= 23: _config_int(to_save, "schedule_start_time") else: flash(_(u"Invalid start time for task specified"), category="error") error = True - if "0" < to_save.get("schedule_duration") <= "60": + if 0 < int(to_save.get("schedule_duration")) <= 60: _config_int(to_save, "schedule_duration") else: flash(_(u"Invalid duration for task specified"), category="error") diff --git a/cps/schedule.py b/cps/schedule.py index 72f9b230..8b70da6a 100644 --- a/cps/schedule.py +++ b/cps/schedule.py @@ -34,8 +34,8 @@ def get_scheduled_tasks(reconnect=True): # Generate all missing book cover thumbnails if config.schedule_generate_book_covers: - tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False]) tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True]) + tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False]) # Generate all missing series thumbnails if config.schedule_generate_series_covers: diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 2ba78125..df55a037 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2022-02-09 06:42:55

+

Start Time: 2022-04-25 20:37:58

-

Stop Time: 2022-02-09 11:35:55

+

Stop Time: 2022-04-26 02:14:54

-

Duration: 4h 6 min

+

Duration: 4h 44 min

@@ -332,19 +332,28 @@ TestCliGdrivedb - 2 - 2 + 3 + 3 0 0 0 - Detail + Detail + +
TestCliGdrivedb - test_cli_gdrive_folder
+ + PASS + + + + +
TestCliGdrivedb - test_cli_gdrive_location
@@ -353,7 +362,7 @@ - +
TestCliGdrivedb - test_gdrive_db_nonwrite
@@ -420,11 +429,11 @@ - + TestEbookConvertCalibre 15 - 2 - 13 + 15 + 0 0 0 @@ -434,33 +443,11 @@ - +
TestEbookConvertCalibre - test_calibre_log
- -
- FAIL -
- - - - + PASS @@ -474,281 +461,83 @@ AssertionError: 'Convert: PDF -> ODT: book9' != 'Failed' - +
TestEbookConvertCalibre - test_convert_email
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_failed_and_email
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_only
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_options
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_parameter
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_wrong_excecutable
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_convert_xss
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_email_failed
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_email_only
- -
- FAIL -
- - - - + PASS @@ -762,95 +551,29 @@ AssertionError: 'Convert: MOBI -> EPUB: Buuko' != 'Finished' - +
TestEbookConvertCalibre - test_ssl_smtp_setup_error
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_starttls_smtp_setup_error
- -
- FAIL -
- - - - + PASS - +
TestEbookConvertCalibre - test_user_convert_xss
- -
- FAIL -
- - - - + PASS @@ -858,37 +581,91 @@ AssertionError: 'Convert: MOBI -> EPUB: Buuko' != 'Finished' TestEbookConvertCalibreGDrive + 7 6 - 0 - 6 + 1 0 0 - Detail + Detail - +
TestEbookConvertCalibreGDrive - test_convert_email
+ PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
+ + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_convert_only
+ + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_convert_parameter
+ + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_email_failed
+ + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_email_only
+ + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_thumbnail_cache
+
- FAIL + FAIL
-