Skip to content

Commit

Permalink
Fix instances of bad-classmethod-argument in recently edited files
Browse files Browse the repository at this point in the history
  • Loading branch information
dato committed Mar 18, 2024
1 parent 4b9fe0a commit e2c9ea3
Show file tree
Hide file tree
Showing 117 changed files with 515 additions and 529 deletions.
8 changes: 4 additions & 4 deletions bookwyrm/tests/activitypub/test_base_activity.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ class BaseActivity(TestCase):
"""the super class for model-linked activitypub dataclasses"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""we're probably going to re-use this so why copy/paste"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.user = models.User.objects.create_user(
cls.user = models.User.objects.create_user(
"mouse", "[email protected]", "mouseword", local=True, localname="mouse"
)
self.user.remote_id = "http://example.com/a/b"
self.user.save(broadcast=False, update_fields=["remote_id"])
cls.user.remote_id = "http://example.com/a/b"
cls.user.save(broadcast=False, update_fields=["remote_id"])

def setUp(self):
datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
Expand Down
10 changes: 5 additions & 5 deletions bookwyrm/tests/activitypub/test_note.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ class Note(TestCase):
"""the model-linked ActivityPub dataclass for Note-based types"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""create a shared user"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.user = models.User.objects.create_user(
cls.user = models.User.objects.create_user(
"mouse", "[email protected]", "mouseword", local=True, localname="mouse"
)
self.user.remote_id = "https://test-instance.org/user/critic"
self.user.save(broadcast=False, update_fields=["remote_id"])
cls.user.remote_id = "https://test-instance.org/user/critic"
cls.user.save(broadcast=False, update_fields=["remote_id"])

self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Test Edition", remote_id="http://book.com/book"
)

Expand Down
10 changes: 5 additions & 5 deletions bookwyrm/tests/activitystreams/test_abstractstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@ class Activitystreams(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
self.another_user = models.User.objects.create_user(
cls.another_user = models.User.objects.create_user(
"nutria",
"[email protected]",
"password",
local=True,
localname="nutria",
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand All @@ -44,7 +44,7 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument
outbox="https://example.com/users/rat/outbox",
)
work = models.Work.objects.create(title="test work")
self.book = models.Edition.objects.create(title="test book", parent_work=work)
cls.book = models.Edition.objects.create(title="test book", parent_work=work)

def setUp(self):
"""per-test setUp"""
Expand Down
8 changes: 4 additions & 4 deletions bookwyrm/tests/activitystreams/test_booksstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ class Activitystreams(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand All @@ -36,7 +36,7 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument
outbox="https://example.com/users/rat/outbox",
)
work = models.Work.objects.create(title="test work")
self.book = models.Edition.objects.create(title="test book", parent_work=work)
cls.book = models.Edition.objects.create(title="test book", parent_work=work)

def test_get_statuses_for_user_books(self, *_):
"""create a stream for a user"""
Expand Down
8 changes: 4 additions & 4 deletions bookwyrm/tests/activitystreams/test_homestream.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ class Activitystreams(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
self.another_user = models.User.objects.create_user(
cls.another_user = models.User.objects.create_user(
"nutria",
"[email protected]",
"password",
local=True,
localname="nutria",
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand Down
10 changes: 5 additions & 5 deletions bookwyrm/tests/activitystreams/test_localstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ class Activitystreams(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
self.another_user = models.User.objects.create_user(
cls.another_user = models.User.objects.create_user(
"nutria",
"[email protected]",
"password",
local=True,
localname="nutria",
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand All @@ -41,7 +41,7 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument
outbox="https://example.com/users/rat/outbox",
)
work = models.Work.objects.create(title="test work")
self.book = models.Edition.objects.create(title="test book", parent_work=work)
cls.book = models.Edition.objects.create(title="test book", parent_work=work)

def test_localstream_get_audience_remote_status(self, *_):
"""get a list of users that should see a status"""
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/activitystreams/test_signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ class ActivitystreamsSignals(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand Down
14 changes: 6 additions & 8 deletions bookwyrm/tests/activitystreams/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ class Activitystreams(TestCase):
"""using redis to build activity streams"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""use a test csv"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True, localname="mouse"
)
self.another_user = models.User.objects.create_user(
cls.another_user = models.User.objects.create_user(
"nutria",
"[email protected]",
"password",
local=True,
localname="nutria",
)
with patch("bookwyrm.models.user.set_remote_server.delay"):
self.remote_user = models.User.objects.create_user(
cls.remote_user = models.User.objects.create_user(
"rat",
"[email protected]",
"ratword",
Expand All @@ -36,11 +36,9 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument
outbox="https://example.com/users/rat/outbox",
)
work = models.Work.objects.create(title="test work")
self.book = models.Edition.objects.create(title="test book", parent_work=work)
cls.book = models.Edition.objects.create(title="test book", parent_work=work)
with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"):
self.status = models.Status.objects.create(
content="hi", user=self.local_user
)
cls.status = models.Status.objects.create(content="hi", user=cls.local_user)

def test_add_book_statuses_task(self):
"""statuses related to a book"""
Expand Down
2 changes: 1 addition & 1 deletion bookwyrm/tests/connectors/test_inventaire_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Inventaire(TestCase):
"""test loading data from inventaire.io"""

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""creates the connector in the database"""
models.Connector.objects.create(
identifier="inventaire.io",
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/importers/test_calibre_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ def setUp(self):
self.csv = open(datafile, "r", encoding=self.importer.encoding)

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""populate database"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True
)
models.SiteSettings.objects.create()
work = models.Work.objects.create(title="Test Work")
self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Example Edition",
remote_id="https://example.com/book/1",
parent_work=work,
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/importers/test_goodreads_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ def setUp(self):
self.csv = open(datafile, "r", encoding=self.importer.encoding)

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""populate database"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True
)
models.SiteSettings.objects.create()
work = models.Work.objects.create(title="Test Work")
self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Example Edition",
remote_id="https://example.com/book/1",
parent_work=work,
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/importers/test_importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ def setUp(self):
self.csv = open(datafile, "r", encoding=self.importer.encoding)

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""populate database"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True
)
models.SiteSettings.objects.create()
work = models.Work.objects.create(title="Test Work")
self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Example Edition",
remote_id="https://example.com/book/1",
parent_work=work,
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/importers/test_librarything_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ def setUp(self):
self.csv = open(datafile, "r", encoding=self.importer.encoding)

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""populate database"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mmai", "[email protected]", "password", local=True
)
models.SiteSettings.objects.create()
work = models.Work.objects.create(title="Test Work")
self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Example Edition",
remote_id="https://example.com/book/1",
parent_work=work,
Expand Down
6 changes: 3 additions & 3 deletions bookwyrm/tests/importers/test_openlibrary_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ def setUp(self):
self.csv = open(datafile, "r", encoding=self.importer.encoding)

@classmethod
def setUpTestData(self): # pylint: disable=bad-classmethod-argument
def setUpTestData(cls):
"""populate database"""
with (
patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"),
patch("bookwyrm.activitystreams.populate_stream_task.delay"),
patch("bookwyrm.lists_stream.populate_lists_task.delay"),
):
self.local_user = models.User.objects.create_user(
cls.local_user = models.User.objects.create_user(
"mouse", "[email protected]", "password", local=True
)
models.SiteSettings.objects.create()
work = models.Work.objects.create(title="Test Work")
self.book = models.Edition.objects.create(
cls.book = models.Edition.objects.create(
title="Example Edition",
remote_id="https://example.com/book/1",
parent_work=work,
Expand Down
Loading

0 comments on commit e2c9ea3

Please sign in to comment.