fix conflicting migrations

This commit is contained in:
Michael Shamoon
2022-07-02 16:55:52 -07:00
parent 811d4973cf
commit 748f0bf610
3 changed files with 3 additions and 5 deletions

View File

@@ -2661,7 +2661,6 @@ class TestTasks(APITestCase):
self.client.force_authenticate(user=self.user)
def test_get_tasks(self):
task_id1 = str(uuid.uuid4())
PaperlessTask.objects.create(task_id=task_id1)
Task.objects.create(
@@ -2687,7 +2686,6 @@ class TestTasks(APITestCase):
self.assertIsNone(returned_task2["attempted_task"])
def test_acknowledge_tasks(self):
task_id = str(uuid.uuid4())
task = PaperlessTask.objects.create(task_id=task_id)
@@ -2701,4 +2699,4 @@ class TestTasks(APITestCase):
self.assertEqual(response.status_code, 200)
response = self.client.get(self.ENDPOINT)
self.assertEqual(len(response.data), 0)
self.assertEqual(len(response.data), 0)