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 | 13595 ++-------------------- 3 files changed, 958 insertions(+), 12639 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,1020 +511,70 @@ 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
- - -
- ERROR -
- - - - - - - - - +
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
- -
- ERROR -
- - - - + PASS - - -
TestEbookConvertCalibreGDrive - test_convert_failed_and_email
- - -
- ERROR -
- - - - - - - - - +
TestEbookConvertCalibreGDrive - test_convert_only
- -
- ERROR -
- - - - + PASS - - -
TestEbookConvertCalibreGDrive - test_convert_only
- - -
- ERROR -
- - - - - - - - - +
TestEbookConvertCalibreGDrive - test_convert_parameter
- -
- ERROR -
- - - - + PASS - - -
TestEbookConvertCalibreGDrive - test_convert_parameter
- - -
- ERROR -
- - - - - - - - - +
TestEbookConvertCalibreGDrive - test_email_failed
- -
- ERROR -
- - - - + PASS - - -
TestEbookConvertCalibreGDrive - test_email_failed
- - -
- ERROR -
- - - - - - - - - +
TestEbookConvertCalibreGDrive - test_email_only
- -
- ERROR -
- - - - - - - - - - -
TestEbookConvertCalibreGDrive - test_email_only
- - -
- ERROR -
- - - - + PASS @@ -1571,10 +621,8 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host='127.0.0.1', port=5111 
Traceback (most recent call last):
   File "/home/matthias/Entwicklung/calibre-web-test/test/test_ebook_convert_kepubify.py", line 157, in test_convert_only
-    self.assertEqual(ret[-1]['result'], 'Finished')
-AssertionError: 'Failed' != 'Finished'
-- Failed
-+ Finished
+ self.assertEqual(len(ret), len(ret2), "Reconvert of book started") +AssertionError: 2 != 3 : Reconvert of book started
@@ -1594,13 +642,13 @@ AssertionError: 'Failed' != 'Finished' - + TestEbookConvertGDriveKepubify 3 + 2 + 1 0 0 - 3 - 0 Detail @@ -1608,73 +656,35 @@ AssertionError: 'Failed' != 'Finished' - +
TestEbookConvertGDriveKepubify - test_convert_deactivate
- -
- ERROR -
- - - - + PASS - +
TestEbookConvertGDriveKepubify - test_convert_only
- ERROR + FAIL
- 
Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 826, in test_watch_metadata
-    self.assertTrue(button)
-AssertionError: False is not true
+ File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 844, in test_watch_metadata + self.assertNotIn('series', book) +AssertionError: 'series' unexpectedly found in {'reader': ['epub'], 'title': 'testbook', 'author': ['John Döe'], 'rating': 0, 'languages': ['English'], 'identifier': [], 'cover': '/cover/5?edit=14db778b-76ee-4bdf-baac-371aa555331f', 'tag': [], 'publisher': ['Randomhäus'], 'comment': '\n', 'add_shelf': [], 'del_shelf': [], 'edit_enable': True, 'kindle': None, 'kindlebtn': None, 'download': ['EPUB (6.7 kB)'], 'read': False, 'archived': False, 'series_all': 'Book 1.0 of test', 'series_index': '1.0', 'series': 'test', 'cust_columns': []}
@@ -2722,12 +1624,12 @@ AssertionError: False is not true - + TestKoboSync 9 - 5 - 4 - 0 + 3 + 3 + 3 0 Detail @@ -2823,11 +1725,83 @@ AssertionError: 1 != 0 - +
TestKoboSync - test_sync_reading_state
- PASS + +
+ ERROR +
+ + + + @@ -2849,9 +1823,9 @@ AssertionError: 1 != 0 
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
-