From ab72e6bdd1e42dce83fd7dba35919d6468d8ada3 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Mon, 17 Oct 2011 02:11:12 +0000 Subject: [PATCH] Tweaked a tests tweak from r16960 so it uses the right model. When testing for permission enforcement in the admin for m2m relationships we were erroneously using the ID of the related model instead of using the ID of the corresponding automatically created intermediate model. This manifested as a failure under Oracle but can fail with any backend if the IDs of both models diverge. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17001 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_inlines/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/regressiontests/admin_inlines/tests.py b/tests/regressiontests/admin_inlines/tests.py index c2f10c0678..c2e3bbc397 100644 --- a/tests/regressiontests/admin_inlines/tests.py +++ b/tests/regressiontests/admin_inlines/tests.py @@ -233,7 +233,9 @@ class TestInlinePermissions(TestCase): author = Author.objects.create(pk=1, name=u'The Author') book = author.books.create(name=u'The inline Book') self.author_change_url = '/admin/admin_inlines/author/%i/' % author.id - self.book_id = book.id + # Get the ID of the automatically created intermediate model for thw Author-Book m2m + author_book_auto_m2m_intermediate = Author.books.through.objects.get(author=author, book=book) + self.author_book_auto_m2m_intermediate_id = author_book_auto_m2m_intermediate.pk holder = Holder2.objects.create(dummy=13) inner2 = Inner2.objects.create(dummy=42, holder=holder) @@ -311,7 +313,7 @@ class TestInlinePermissions(TestCase): self.assertContains(response, '

Author-book relationships

') self.assertContains(response, 'Add another Author-Book Relationship') self.assertContains(response, 'value="4" id="id_Author_books-TOTAL_FORMS"') - self.assertContains(response, '