edits for many test apps

Author: timgraham

tests/admin_filters/tests.py

@@ -700,7 +700,7 @@ def test_relatedfieldlistfilter_foreignkey(self):
         choice = select_by(filterspec.choices(changelist), "display", "alfred")
         self.assertIs(choice["selected"], True)
         self.assertEqual(
-            choice["query_string"], "?author__id__exact=%d" % self.alfred.pk
+            choice["query_string"], "?author__id__exact=%s" % self.alfred.pk
         )
 
     def test_relatedfieldlistfilter_foreignkey_ordering(self):
@@ -803,7 +803,7 @@ def test_relatedfieldlistfilter_manytomany(self):
         choice = select_by(filterspec.choices(changelist), "display", "bob")
         self.assertIs(choice["selected"], True)
         self.assertEqual(
-            choice["query_string"], "?contributors__id__exact=%d" % self.bob.pk
+            choice["query_string"], "?contributors__id__exact=%s" % self.bob.pk
         )
 
     def test_relatedfieldlistfilter_reverse_relationships(self):
@@ -839,7 +839,7 @@ def test_relatedfieldlistfilter_reverse_relationships(self):
         )
         self.assertIs(choice["selected"], True)
         self.assertEqual(
-            choice["query_string"], "?books_authored__id__exact=%d" % self.bio_book.pk
+            choice["query_string"], "?books_authored__id__exact=%s" % self.bio_book.pk
         )
 
         # M2M relationship -----
@@ -873,7 +873,7 @@ def test_relatedfieldlistfilter_reverse_relationships(self):
         self.assertIs(choice["selected"], True)
         self.assertEqual(
             choice["query_string"],
-            "?books_contributed__id__exact=%d" % self.django_book.pk,
+            "?books_contributed__id__exact=%s" % self.django_book.pk,
         )
 
         # With one book, the list filter should appear because there is also a

tests/admin_inlines/tests.py

@@ -1069,7 +1069,7 @@ def test_inline_change_m2m_change_perm(self):
         )
         self.assertContains(
             response,
-            '<input type="hidden" id="id_Author_books-0-id" value="%i" '
+            '<input type="hidden" id="id_Author_books-0-id" value="%s" '
             'name="Author_books-0-id">' % self.author_book_auto_m2m_intermediate_id,
             html=True,
         )
@@ -1093,7 +1093,7 @@ def test_inline_change_fk_add_perm(self):
         )
         self.assertNotContains(
             response,
-            '<input type="hidden" id="id_inner2_set-0-id" value="%i" '
+            '<input type="hidden" id="id_inner2_set-0-id" value="%s" '
             'name="inner2_set-0-id">' % self.inner2.id,
             html=True,
         )
@@ -1115,7 +1115,7 @@ def test_inline_change_fk_change_perm(self):
         )
         self.assertContains(
             response,
-            '<input type="hidden" id="id_inner2_set-0-id" value="%i" '
+            '<input type="hidden" id="id_inner2_set-0-id" value="%s" '
             'name="inner2_set-0-id">' % self.inner2.id,
             html=True,
         )
@@ -1158,7 +1158,7 @@ def test_inline_change_fk_add_change_perm(self):
         )
         self.assertContains(
             response,
-            '<input type="hidden" id="id_inner2_set-0-id" value="%i" '
+            '<input type="hidden" id="id_inner2_set-0-id" value="%s" '
             'name="inner2_set-0-id">' % self.inner2.id,
             html=True,
         )
@@ -1184,7 +1184,7 @@ def test_inline_change_fk_change_del_perm(self):
         )
         self.assertContains(
             response,
-            '<input type="hidden" id="id_inner2_set-0-id" value="%i" '
+            '<input type="hidden" id="id_inner2_set-0-id" value="%s" '
             'name="inner2_set-0-id">' % self.inner2.id,
             html=True,
         )
@@ -1215,7 +1215,7 @@ def test_inline_change_fk_all_perms(self):
         )
         self.assertContains(
             response,
-            '<input type="hidden" id="id_inner2_set-0-id" value="%i" '
+            '<input type="hidden" id="id_inner2_set-0-id" value="%s" '
             'name="inner2_set-0-id">' % self.inner2.id,
             html=True,
         )

tests/admin_utils/test_logentry.py

@@ -202,7 +202,7 @@ def test_logentry_get_admin_url(self):
             "admin:admin_utils_article_change", args=(quote(self.a1.pk),)
         )
         self.assertEqual(logentry.get_admin_url(), expected_url)
-        self.assertIn("article/%d/change/" % self.a1.pk, logentry.get_admin_url())
+        self.assertIn("article/%s/change/" % self.a1.pk, logentry.get_admin_url())
 
         logentry.content_type.model = "nonexistent"
         self.assertIsNone(logentry.get_admin_url())

tests/admin_views/admin.py

@@ -606,7 +606,7 @@ class PostAdmin(admin.ModelAdmin):
     @admin.display
     def coolness(self, instance):
         if instance.pk:
-            return "%d amount of cool." % instance.pk
+            return "%s amount of cool." % instance.pk
         else:
             return "Unknown coolness."
 

tests/admin_views/tests.py

@@ -1163,7 +1163,7 @@ def test_disallowed_filtering(self):
         response = self.client.get(reverse("admin:admin_views_workhour_changelist"))
         self.assertContains(response, "employee__person_ptr__exact")
         response = self.client.get(
-            "%s?employee__person_ptr__exact=%d"
+            "%s?employee__person_ptr__exact=%s"
             % (reverse("admin:admin_views_workhour_changelist"), e1.pk)
         )
         self.assertEqual(response.status_code, 200)
@@ -4524,13 +4524,13 @@ def test_pk_hidden_fields(self):
         self.assertContains(
             response,
             '<div class="hiddenfields">\n'
-            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id">'
-            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id">\n'
+            '<input type="hidden" name="form-0-id" value="%s" id="id_form-0-id">'
+            '<input type="hidden" name="form-1-id" value="%s" id="id_form-1-id">\n'
             "</div>" % (story2.id, story1.id),
             html=True,
         )
-        self.assertContains(response, '<td class="field-id">%d</td>' % story1.id, 1)
-        self.assertContains(response, '<td class="field-id">%d</td>' % story2.id, 1)
+        self.assertContains(response, '<td class="field-id">%s</td>' % story1.id, 1)
+        self.assertContains(response, '<td class="field-id">%s</td>' % story2.id, 1)
 
     def test_pk_hidden_fields_with_list_display_links(self):
         """Similarly as test_pk_hidden_fields, but when the hidden pk fields are
@@ -4554,19 +4554,19 @@ def test_pk_hidden_fields_with_list_display_links(self):
         self.assertContains(
             response,
             '<div class="hiddenfields">\n'
-            '<input type="hidden" name="form-0-id" value="%d" id="id_form-0-id">'
-            '<input type="hidden" name="form-1-id" value="%d" id="id_form-1-id">\n'
+            '<input type="hidden" name="form-0-id" value="%s" id="id_form-0-id">'
+            '<input type="hidden" name="form-1-id" value="%s" id="id_form-1-id">\n'
             "</div>" % (story2.id, story1.id),
             html=True,
         )
         self.assertContains(
             response,
-            '<th class="field-id"><a href="%s">%d</a></th>' % (link1, story1.id),
+            '<th class="field-id"><a href="%s">%s</a></th>' % (link1, story1.id),
             1,
         )
         self.assertContains(
             response,
-            '<th class="field-id"><a href="%s">%d</a></th>' % (link2, story2.id),
+            '<th class="field-id"><a href="%s">%s</a></th>' % (link2, story2.id),
             1,
         )
 
@@ -4890,7 +4890,7 @@ def setUpTestData(cls):
         cls.superuser = User.objects.create_superuser(
             username="super", password="secret", email="[email protected]"
         )
-        cls.pks = [EmptyModel.objects.create().id for i in range(3)]
+        cls.pks = [EmptyModel.objects.create(id=i + 1).id for i in range(3)]
 
     def setUp(self):
         self.client.force_login(self.superuser)
@@ -6803,7 +6803,7 @@ def test_readonly_get(self):
         response = self.client.get(
             reverse("admin:admin_views_post_change", args=(p.pk,))
         )
-        self.assertContains(response, "%d amount of cool" % p.pk)
+        self.assertContains(response, "%s amount of cool" % p.pk)
 
     @ignore_warnings(category=RemovedInDjango60Warning)
     def test_readonly_text_field(self):

tests/async/test_async_queryset.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 
 from asgiref.sync import async_to_sync, sync_to_async
+from bson import ObjectId
 
 from django.db import NotSupportedError, connection
 from django.db.models import Prefetch, Sum
@@ -207,9 +208,7 @@ async def test_acontains(self):
         check = await SimpleModel.objects.acontains(self.s1)
         self.assertIs(check, True)
         # Unsaved instances are not allowed, so use an ID known not to exist.
-        check = await SimpleModel.objects.acontains(
-            SimpleModel(id=self.s3.id + 1, field=4)
-        )
+        check = await SimpleModel.objects.acontains(SimpleModel(id=ObjectId(), field=4))
         self.assertIs(check, False)
 
     async def test_aupdate(self):

tests/auth_tests/test_context_processors.py

@@ -140,7 +140,7 @@ def test_user_attrs(self):
         user = authenticate(username="super", password="secret")
         response = self.client.get("/auth_processor_user/")
         self.assertContains(response, "unicode: super")
-        self.assertContains(response, "id: %d" % self.superuser.pk)
+        self.assertContains(response, "id: %s" % self.superuser.pk)
         self.assertContains(response, "username: super")
         # bug #12037 is tested by the {% url %} in the template:
         self.assertContains(response, "url: /userpage/super/")

tests/auth_tests/test_management.py

@@ -610,10 +610,12 @@ def test_validate_fk(self):
 
     @override_settings(AUTH_USER_MODEL="auth_tests.CustomUserWithFK")
     def test_validate_fk_environment_variable(self):
+        from bson import ObjectId
+
         email = Email.objects.create(email="[email protected]")
         Group.objects.all().delete()
-        nonexistent_group_id = 1
-        msg = f"group instance with id {nonexistent_group_id} does not exist."
+        nonexistent_group_id = ObjectId()
+        msg = f"group instance with id {nonexistent_group_id!r} does not exist."
 
         with mock.patch.dict(
             os.environ,
@@ -1532,5 +1534,5 @@ def test_set_permissions_fk_to_using_parameter(self):
         Permission.objects.using("other").delete()
         with self.assertNumQueries(6, using="other") as captured_queries:
             create_permissions(apps.get_app_config("auth"), verbosity=0, using="other")
-        self.assertIn("INSERT INTO", captured_queries[-1]["sql"].upper())
+        self.assertIn("INSERT_MANY", captured_queries[-1]["sql"].upper())
         self.assertGreater(Permission.objects.using("other").count(), 0)

tests/contenttypes_tests/test_fields.py

@@ -33,7 +33,7 @@ def test_get_object_cache_respects_deleted_objects(self):
 
         post = Post.objects.get(pk=post.pk)
         with self.assertNumQueries(1):
-            self.assertEqual(post.object_id, question_pk)
+            self.assertEqual(post.object_id, str(question_pk))
             self.assertIsNone(post.parent)
             self.assertIsNone(post.parent)
 

tests/contenttypes_tests/urls.py

@@ -2,5 +2,5 @@
 from django.urls import re_path
 
 urlpatterns = [
-    re_path(r"^shortcut/([0-9]+)/(.*)/$", views.shortcut),
+    re_path(r"^shortcut/([\w]+)/(.*)/$", views.shortcut),
 ]