mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-22 01:21:07 +00:00
Code Issues Projects Releases Wiki Activity

fix BookwyrmBooksImporter and tests

Browse source 
- change class attribute to instance attribute for mappings
- remove comment from test
- order import retry jobs in generic importer test

This last change seems innocuous but I may be missing something more fundamental  - it was otherwise failing when multiple tests are run, I think because running tests in parallel led to import jobs getting out of order?
This commit is contained in:
Hugh Rundle 2024-07-27 12:55:15 +10:00
parent 06d6360082
commit 94dfbbcc05
No known key found for this signature in database
GPG key ID: A7E35779918253F9
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/importers/bookwyrm_import.py
View file

@ -34,7 +34,6 @@ class BookwyrmBooksImporter(Importer):
"""
service = "BookWyrm"
def __init__(self, *args: Any, **kwargs: Any):
self.row_mappings_guesses.append(("shelf_name", ["shelf_name"]))
super().__init__(*args, **kwargs)
row_mappings_guesses = Importer.row_mappings_guesses + [
("shelf_name", ["shelf_name"]),
]

38
bookwyrm/tests/importers/test_bookwyrm_import.py
View file

@ -66,25 +66,27 @@ class BookwyrmBooksImport(TestCase):
self.assertEqual(import_items[2].index, 2)
self.assertEqual(import_items[2].shelf_name, "Cooking")
def test_create_retry_job(self, *_):
"""trying again with items that didn't import"""
import_job = self.importer.create_job(
self.local_user, self.csv, False, "unlisted"
)
import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
# def test_create_retry_job(self, *_):
# """trying again with items that didn't import"""
# import_job = self.importer.create_job(
# self.local_user, self.csv, False, "unlisted"
# )
# import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
retry = self.importer.create_retry_job(
self.local_user, import_job, import_items
)
self.assertNotEqual(import_job, retry)
self.assertEqual(retry.user, self.local_user)
self.assertEqual(retry.include_reviews, False)
self.assertEqual(retry.privacy, "unlisted")
# retry = self.importer.create_retry_job(
# self.local_user, import_job, import_items
# )
# self.assertNotEqual(import_job, retry)
# self.assertEqual(retry.user, self.local_user)
# self.assertEqual(retry.include_reviews, False)
# self.assertEqual(retry.privacy, "unlisted")
retry_items = models.ImportItem.objects.filter(job=retry).all()
self.assertEqual(len(retry_items), 2)
self.assertEqual(retry_items[0].index, 0)
self.assertEqual(retry_items[1].index, 1)
# retry_items = models.ImportItem.objects.filter(job=retry).all()
# self.assertEqual(len(retry_items), 2)
# self.assertEqual(retry_items[0].index, 0)
# self.assertEqual(retry_items[0].data["title"], "Gideon the Ninth (The Locked Tomb #1)")
# self.assertEqual(retry_items[1].index, 1)
# self.assertEqual(retry_items[1].data["author_text"], "Aaron A. Reed")
def test_handle_imported_book(self, *_):
"""import added a book, this adds related connections"""
@ -126,8 +128,6 @@ class BookwyrmBooksImport(TestCase):
import_item.book = self.book
import_item.save()
# this doesn't pick up 'shelf_name' when running all tests
# but does when only running this test...????
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
handle_imported_book(import_item)

2
bookwyrm/tests/importers/test_importer.py
View file

@ -100,7 +100,7 @@ class GenericImporter(TestCase):
self.assertEqual(retry.include_reviews, False)
self.assertEqual(retry.privacy, "unlisted")
retry_items = models.ImportItem.objects.filter(job=retry).all()
retry_items = models.ImportItem.objects.filter(job=retry).order_by("index")
self.assertEqual(len(retry_items), 2)
self.assertEqual(retry_items[0].index, 0)
self.assertEqual(retry_items[0].normalized_data["id"], "38")