From 23a316529ddf58feab3483906f60f31a1f98701d Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 27 Sep 2024 11:41:12 +0100 Subject: [PATCH] Remove stray type ignore comments --- tests/tasks/test_dummy_backend.py | 46 ++++++++------------------- tests/tasks/test_immediate_backend.py | 34 ++++++-------------- tests/tasks/test_tasks.py | 14 +++----- 3 files changed, 27 insertions(+), 67 deletions(-) diff --git a/tests/tasks/test_dummy_backend.py b/tests/tasks/test_dummy_backend.py index 3871dd51c9..5470dac945 100644 --- a/tests/tasks/test_dummy_backend.py +++ b/tests/tasks/test_dummy_backend.py @@ -15,7 +15,7 @@ from . import tasks as test_tasks ) class DummyBackendTestCase(SimpleTestCase): def setUp(self): - default_task_backend.clear() # type:ignore[attr-defined] + default_task_backend.clear() def test_using_correct_backend(self): self.assertEqual(default_task_backend, tasks["default"]) @@ -35,9 +35,7 @@ class DummyBackendTestCase(SimpleTestCase): self.assertEqual(result.args, [1]) self.assertEqual(result.kwargs, {"two": 3}) - self.assertIn( - result, default_task_backend.results - ) # type:ignore[attr-defined] + self.assertIn(result, default_task_backend.results) async def test_enqueue_task_async(self): for task in [test_tasks.noop_task, test_tasks.noop_task_async]: @@ -53,9 +51,7 @@ class DummyBackendTestCase(SimpleTestCase): self.assertEqual(result.args, []) self.assertEqual(result.kwargs, {}) - self.assertIn( - result, default_task_backend.results - ) # type:ignore[attr-defined] + self.assertIn(result, default_task_backend.results) def test_get_result(self): result = default_task_backend.enqueue(test_tasks.noop_task, (), {}) @@ -76,7 +72,7 @@ class DummyBackendTestCase(SimpleTestCase): test_tasks.calculate_meaning_of_life, (), {} ) - enqueued_result = default_task_backend.results[0] # type:ignore[attr-defined] + enqueued_result = default_task_backend.results[0] object.__setattr__(enqueued_result, "status", ResultStatus.COMPLETE) self.assertEqual(result.status, ResultStatus.NEW) @@ -88,7 +84,7 @@ class DummyBackendTestCase(SimpleTestCase): test_tasks.calculate_meaning_of_life, (), {} ) - enqueued_result = default_task_backend.results[0] # type:ignore[attr-defined] + enqueued_result = default_task_backend.results[0] object.__setattr__(enqueued_result, "status", ResultStatus.COMPLETE) self.assertEqual(result.status, ResultStatus.NEW) @@ -136,13 +132,9 @@ class DummyBackendTransactionTestCase(TransactionTestCase): with transaction.atomic(): test_tasks.noop_task.enqueue() - self.assertEqual( - len(default_task_backend.results), 0 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 0) - self.assertEqual( - len(default_task_backend.results), 1 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 1) @override_settings( TASKS={ @@ -163,13 +155,9 @@ class DummyBackendTransactionTestCase(TransactionTestCase): self.assertIsNotNone(result.enqueued_at) - self.assertEqual( - len(default_task_backend.results), 1 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 1) - self.assertEqual( - len(default_task_backend.results), 1 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 1) @override_settings( TASKS={ @@ -189,13 +177,9 @@ class DummyBackendTransactionTestCase(TransactionTestCase): self.assertIsNone(result.enqueued_at) - self.assertEqual( - len(default_task_backend.results), 0 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 0) - self.assertEqual( - len(default_task_backend.results), 1 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 1) self.assertIsNone(result.enqueued_at) result.refresh() self.assertIsNotNone(result.enqueued_at) @@ -222,13 +206,9 @@ class DummyBackendTransactionTestCase(TransactionTestCase): self.assertIsNone(result.enqueued_at) - self.assertEqual( - len(default_task_backend.results), 0 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 0) - self.assertEqual( - len(default_task_backend.results), 1 - ) # type:ignore[attr-defined] + self.assertEqual(len(default_task_backend.results), 1) self.assertIsNone(result.enqueued_at) result.refresh() self.assertIsNotNone(result.enqueued_at) diff --git a/tests/tasks/test_immediate_backend.py b/tests/tasks/test_immediate_backend.py index 3294023d69..ad12908538 100644 --- a/tests/tasks/test_immediate_backend.py +++ b/tests/tasks/test_immediate_backend.py @@ -27,12 +27,8 @@ class ImmediateBackendTestCase(SimpleTestCase): self.assertEqual(result.status, ResultStatus.COMPLETE) self.assertIsNotNone(result.started_at) self.assertIsNotNone(result.finished_at) - self.assertGreaterEqual( - result.started_at, result.enqueued_at - ) # type:ignore[arg-type, misc] - self.assertGreaterEqual( - result.finished_at, result.started_at - ) # type:ignore[arg-type, misc] + self.assertGreaterEqual(result.started_at, result.enqueued_at) + self.assertGreaterEqual(result.finished_at, result.started_at) self.assertIsNone(result.return_value) self.assertEqual(result.task, task) self.assertEqual(result.args, [1]) @@ -46,12 +42,8 @@ class ImmediateBackendTestCase(SimpleTestCase): self.assertEqual(result.status, ResultStatus.COMPLETE) self.assertIsNotNone(result.started_at) self.assertIsNotNone(result.finished_at) - self.assertGreaterEqual( - result.started_at, result.enqueued_at - ) # type:ignore[arg-type, misc] - self.assertGreaterEqual( - result.finished_at, result.started_at - ) # type:ignore[arg-type, misc] + self.assertGreaterEqual(result.started_at, result.enqueued_at) + self.assertGreaterEqual(result.finished_at, result.started_at) self.assertIsNone(result.return_value) self.assertEqual(result.task, task) self.assertEqual(result.args, []) @@ -85,12 +77,8 @@ class ImmediateBackendTestCase(SimpleTestCase): self.assertEqual(result.status, ResultStatus.FAILED) self.assertIsNotNone(result.started_at) self.assertIsNotNone(result.finished_at) - self.assertGreaterEqual( - result.started_at, result.enqueued_at - ) # type:ignore[arg-type, misc] - self.assertGreaterEqual( - result.finished_at, result.started_at - ) # type:ignore[arg-type, misc] + self.assertGreaterEqual(result.started_at, result.enqueued_at) + self.assertGreaterEqual(result.finished_at, result.started_at) self.assertIsInstance(result.exception, exception) self.assertTrue( result.traceback @@ -117,12 +105,8 @@ class ImmediateBackendTestCase(SimpleTestCase): self.assertEqual(result.status, ResultStatus.FAILED) self.assertIsNotNone(result.started_at) self.assertIsNotNone(result.finished_at) - self.assertGreaterEqual( - result.started_at, result.enqueued_at - ) # type:ignore[arg-type,misc] - self.assertGreaterEqual( - result.finished_at, result.started_at - ) # type:ignore[arg-type,misc] + self.assertGreaterEqual(result.started_at, result.enqueued_at) + self.assertGreaterEqual(result.finished_at, result.started_at) self.assertIsNone(result._return_value) self.assertIsNone(result.traceback) @@ -158,7 +142,7 @@ class ImmediateBackendTestCase(SimpleTestCase): NotImplementedError, "This backend does not support retrieving or refreshing results.", ): - await default_task_backend.aget_result(123) # type:ignore[arg-type] + await default_task_backend.aget_result(123) async def test_cannot_refresh_result(self): result = await default_task_backend.aenqueue( diff --git a/tests/tasks/test_tasks.py b/tests/tasks/test_tasks.py index 180d77f7bd..31f65f78ed 100644 --- a/tests/tasks/test_tasks.py +++ b/tests/tasks/test_tasks.py @@ -36,7 +36,7 @@ from . import tasks as test_tasks ) class TaskTestCase(SimpleTestCase): def setUp(self): - default_task_backend.clear() # type:ignore[attr-defined] + default_task_backend.clear() def test_using_correct_backend(self): self.assertEqual(default_task_backend, tasks["default"]) @@ -55,9 +55,7 @@ class TaskTestCase(SimpleTestCase): self.assertEqual(result.args, []) self.assertEqual(result.kwargs, {}) - self.assertEqual( - default_task_backend.results, [result] - ) # type:ignore[attr-defined] + self.assertEqual(default_task_backend.results, [result]) async def test_enqueue_task_async(self): result = await test_tasks.noop_task.aenqueue() @@ -67,9 +65,7 @@ class TaskTestCase(SimpleTestCase): self.assertEqual(result.args, []) self.assertEqual(result.kwargs, {}) - self.assertEqual( - default_task_backend.results, [result] - ) # type:ignore[attr-defined] + self.assertEqual(default_task_backend.results, [result]) def test_using_priority(self): self.assertEqual(test_tasks.noop_task.priority, 0) @@ -168,7 +164,7 @@ class TaskTestCase(SimpleTestCase): f"priority must be a whole number between {MIN_PRIORITY} and " f"{MAX_PRIORITY}", ): - test_tasks.noop_task.using(priority=3.1) # type:ignore[arg-type] + test_tasks.noop_task.using(priority=3.1) test_tasks.noop_task.using(priority=100) test_tasks.noop_task.using(priority=-100) @@ -224,7 +220,7 @@ class TaskTestCase(SimpleTestCase): InvalidTaskError, "Task function must be a globally importable function", ): - task()(invalid_function) # type:ignore[arg-type] + task()(invalid_function) def test_get_backend(self): self.assertEqual(test_tasks.noop_task.backend, "default")