-
-
Notifications
You must be signed in to change notification settings - Fork 264
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove nesting in several with..patch calls
- Loading branch information
Showing
9 changed files
with
100 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,6 @@ def setUp(self): | |
patch("bookwyrm.lists_stream.populate_lists_task.delay"), | ||
patch("bookwyrm.suggested_users.rerank_user_task.delay"), | ||
): | ||
|
||
self.local_user = models.User.objects.create_user( | ||
"mouse", | ||
"[email protected]", | ||
|
@@ -84,13 +83,13 @@ def test_update_user_profile(self): | |
patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), | ||
patch("bookwyrm.suggested_users.rerank_user_task.delay"), | ||
): | ||
|
||
with open(self.archive_file, "rb") as fileobj: | ||
with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: | ||
|
||
models.bookwyrm_import_job.update_user_profile( | ||
self.local_user, tarfile, self.json_data | ||
) | ||
with ( | ||
open(self.archive_file, "rb") as fileobj, | ||
BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, | ||
): | ||
models.bookwyrm_import_job.update_user_profile( | ||
self.local_user, tarfile, self.json_data | ||
) | ||
|
||
self.local_user.refresh_from_db() | ||
|
||
|
@@ -111,7 +110,6 @@ def test_update_user_settings(self): | |
patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), | ||
patch("bookwyrm.suggested_users.rerank_user_task.delay"), | ||
): | ||
|
||
models.bookwyrm_import_job.update_user_settings( | ||
self.local_user, self.json_data | ||
) | ||
|
@@ -256,14 +254,15 @@ def test_get_or_create_edition_existing(self): | |
|
||
self.assertEqual(models.Edition.objects.count(), 1) | ||
|
||
with open(self.archive_file, "rb") as fileobj: | ||
with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: | ||
|
||
bookwyrm_import_job.get_or_create_edition( | ||
self.json_data["books"][1], tarfile | ||
) # Sand Talk | ||
with ( | ||
open(self.archive_file, "rb") as fileobj, | ||
BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, | ||
): | ||
bookwyrm_import_job.get_or_create_edition( | ||
self.json_data["books"][1], tarfile | ||
) # Sand Talk | ||
|
||
self.assertEqual(models.Edition.objects.count(), 1) | ||
self.assertEqual(models.Edition.objects.count(), 1) | ||
|
||
def test_get_or_create_edition_not_existing(self): | ||
"""Test take a JSON string of books and editions, | ||
|
@@ -272,12 +271,13 @@ def test_get_or_create_edition_not_existing(self): | |
|
||
self.assertEqual(models.Edition.objects.count(), 1) | ||
|
||
with open(self.archive_file, "rb") as fileobj: | ||
with BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile: | ||
|
||
bookwyrm_import_job.get_or_create_edition( | ||
self.json_data["books"][0], tarfile | ||
) # Seeing like a state | ||
with ( | ||
open(self.archive_file, "rb") as fileobj, | ||
BookwyrmTarFile.open(mode="r:gz", fileobj=fileobj) as tarfile, | ||
): | ||
bookwyrm_import_job.get_or_create_edition( | ||
self.json_data["books"][0], tarfile | ||
) # Seeing like a state | ||
|
||
self.assertTrue(models.Edition.objects.filter(isbn_13="9780300070163").exists()) | ||
self.assertEqual(models.Edition.objects.count(), 2) | ||
|
@@ -326,7 +326,6 @@ def test_get_or_create_review(self): | |
patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), | ||
patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), | ||
): | ||
|
||
bookwyrm_import_job.upsert_statuses( | ||
self.local_user, models.Review, reviews, self.book.remote_id | ||
) | ||
|
@@ -364,7 +363,6 @@ def test_get_or_create_comment(self): | |
patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), | ||
patch("bookwyrm.models.bookwyrm_import_job.is_alias", return_value=True), | ||
): | ||
|
||
bookwyrm_import_job.upsert_statuses( | ||
self.local_user, models.Comment, comments, self.book.remote_id | ||
) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,29 +25,31 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument | |
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), | ||
patch("bookwyrm.activitystreams.populate_stream_task.delay"), | ||
patch("bookwyrm.lists_stream.populate_lists_task.delay"), | ||
patch("bookwyrm.suggested_users.rerank_user_task.delay"), | ||
): | ||
with patch("bookwyrm.suggested_users.rerank_user_task.delay"): | ||
self.local_user = models.User.objects.create_user( | ||
"[email protected]", | ||
"[email protected]", | ||
"mouseword", | ||
local=True, | ||
discoverable=True, | ||
localname="mouse", | ||
remote_id="https://example.com/users/mouse", | ||
) | ||
with patch("bookwyrm.models.user.set_remote_server.delay"): | ||
with patch("bookwyrm.suggested_users.rerank_user_task.delay"): | ||
self.remote_user = models.User.objects.create_user( | ||
"rat", | ||
"[email protected]", | ||
"ratword", | ||
local=False, | ||
remote_id="https://example.com/users/rat", | ||
discoverable=True, | ||
inbox="https://example.com/users/rat/inbox", | ||
outbox="https://example.com/users/rat/outbox", | ||
) | ||
self.local_user = models.User.objects.create_user( | ||
"[email protected]", | ||
"[email protected]", | ||
"mouseword", | ||
local=True, | ||
discoverable=True, | ||
localname="mouse", | ||
remote_id="https://example.com/users/mouse", | ||
) | ||
with ( | ||
patch("bookwyrm.models.user.set_remote_server.delay"), | ||
patch("bookwyrm.suggested_users.rerank_user_task.delay"), | ||
): | ||
self.remote_user = models.User.objects.create_user( | ||
"rat", | ||
"[email protected]", | ||
"ratword", | ||
local=False, | ||
remote_id="https://example.com/users/rat", | ||
discoverable=True, | ||
inbox="https://example.com/users/rat/inbox", | ||
outbox="https://example.com/users/rat/outbox", | ||
) | ||
self.work = models.Work.objects.create(title="Test Work") | ||
self.book = models.Edition.objects.create( | ||
title="Test Book", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters