From a80a8aab1c3a37c4cdbe051de1a99d7f4c76f24b Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Tue, 8 Dec 2020 20:11:55 +0100 Subject: [PATCH] Fix LDAP import user --- cps/admin.py | 1 + cps/tasks/convert.py | 1 - test/Calibre-Web TestSummary_Linux.html | 13725 ++-------------------- 3 files changed, 1023 insertions(+), 12704 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index 45f4cd9b..41f21bfb 100644 --- a/cps/admin.py +++ b/cps/admin.py @@ -614,6 +614,7 @@ def _configuration_ldap_helper(to_save, gdriveError): reboot_required |= _config_string(to_save, "config_ldap_user_object") reboot_required |= _config_string(to_save, "config_ldap_group_object_filter") reboot_required |= _config_string(to_save, "config_ldap_group_members_field") + reboot_required |= _config_string(to_save, "config_ldap_member_user_object") reboot_required |= _config_checkbox(to_save, "config_ldap_openldap") reboot_required |= _config_int(to_save, "config_ldap_encryption") reboot_required |= _config_string(to_save, "config_ldap_cacert_path") diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py index 39d42dcd..75542b38 100644 --- a/cps/tasks/convert.py +++ b/cps/tasks/convert.py @@ -112,7 +112,6 @@ class TaskConvert(CalibreTask): if check == 0: cur_book = local_db.get_book(book_id) if os.path.isfile(file_path + format_new_ext): - # check if format is already there and replace it if so, problem with gdrive kepub upload (why?) new_format = db.Data(name=cur_book.data[0].name, book_format=self.settings['new_book_format'].upper(), book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext)) diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index 4133a3ff..4cbce657 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2020-12-08 08:19:58

+

Start Time: 2020-12-08 13:56:36

-

Stop Time: 2020-12-08 10:00:52

+

Stop Time: 2020-12-08 16:13:33

-

Duration: 1h 15 min

+

Duration: 1h 48 min

@@ -511,416 +511,118 @@ AssertionError: False is not true : BMP file is not detected - + TestEbookConvertCalibreGDrive - 12 + 6 + 6 0 0 - 12 0 - Detail + Detail - +
TestEbookConvertCalibreGDrive - test_convert_email
- -
- ERROR -
- - - - + PASS - + -
TestEbookConvertCalibreGDrive - test_convert_email
+
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
- -
- ERROR -
- - - + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_convert_only
+ PASS - + -
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
+
TestEbookConvertCalibreGDrive - test_convert_parameter
- -
- ERROR -
- - - + PASS + + + + + + +
TestEbookConvertCalibreGDrive - test_email_failed
+ PASS - + -
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
+
TestEbookConvertCalibreGDrive - test_email_only
- -
- ERROR -
- - - + + + + +
TestEbookConvertKepubify - test_convert_deactivate
+ PASS - + -
TestEbookConvertCalibreGDrive - test_convert_only
+
TestEbookConvertKepubify - test_convert_only
- ERROR + FAIL
-
Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 295, in test_sync_shelf
-    self.assertEqual(0, len(data))
-AssertionError: 0 != 1
+ File "/home/matthias/Entwicklung/calibre-web-test/test/test_kobo_sync.py", line 272, in test_sync_shelf + self.assertTrue(self.check_element_on_page((By.ID, "flash_success"))) +AssertionError: False is not true
@@ -2861,35 +1835,167 @@ AssertionError: 0 != 1 - +
TestKoboSync - test_sync_unchanged
- PASS + +
+ ERROR +
+ + + + - +
TestKoboSync - test_sync_upload
- FAIL + ERROR
-