Commit 1b73c764 authored by Loic Bistuer's avatar Loic Bistuer
Browse files

Fixed a couple of allow_migrate routers in tests. 

This reverts commit 88e6fbb2.
parent 5131aec7

tests/commands_sql/tests.py

+1 −2
Original line number Diff line number Diff line
@@ -92,14 +92,13 @@ class SQLCommandsTestCase(TestCase): 




class TestRouter(object):

    def allow_migrate(self, db, model):

    def allow_migrate(self, db, app_label, **hints):

        return False





@override_settings(DATABASE_ROUTERS=[TestRouter()])

class SQLCommandsRouterTestCase(TestCase):



    @ignore_warnings(category=RemovedInDjango20Warning)

    def test_router_honored(self):

        app_config = apps.get_app_config('commands_sql')

        for sql_command in (sql_all, sql_create, sql_delete, sql_indexes, sql_destroy_indexes):

tests/multiple_database/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ class AntiPetRouter(object): 
    # A router that only expresses an opinion on migrate,

    # passing pets to the 'other' database



    def allow_migrate(self, db, app_label, model_name, **hints):

    def allow_migrate(self, db, app_label, model_name=None, **hints):

        if db == 'other':

            return model_name == 'pet'

        else: