diff --git a/common/test/db_cache/lettuce.db b/common/test/db_cache/lettuce.db index 391bb8064e..94eeb9632b 100644 Binary files a/common/test/db_cache/lettuce.db and b/common/test/db_cache/lettuce.db differ diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index c598cb3bff..7a8b3bee55 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -195,3 +195,7 @@ SECRET_KEY = uuid.uuid4().hex ############################### PIPELINE ####################################### PIPELINE_ENABLED = False + +# We want to make sure that any new migrations are run +# see https://groups.google.com/forum/#!msg/django-developers/PWPj3etj3-U/kCl6pMsQYYoJ +MIGRATION_MODULES = {} diff --git a/pavelib/utils/test/suites/acceptance_suite.py b/pavelib/utils/test/suites/acceptance_suite.py index 631dab98ce..70c226dd06 100644 --- a/pavelib/utils/test/suites/acceptance_suite.py +++ b/pavelib/utils/test/suites/acceptance_suite.py @@ -126,8 +126,8 @@ class AcceptanceTestSuite(TestSuite): sh("cp {db_cache} {db}".format(db_cache=self.db_cache, db=self.db)) # Run migrations to update the db, starting from its cached state - sh("./manage.py lms --settings acceptance migrate --traceback --noinput") - sh("./manage.py cms --settings acceptance migrate --traceback --noinput") + sh("./manage.py lms --settings acceptance migrate --traceback --noinput --fake-initial") + sh("./manage.py cms --settings acceptance migrate --traceback --noinput --fake-initial") else: # If no cached database exists, syncdb before migrating, then create the cache sh("./manage.py lms --settings acceptance migrate --traceback --noinput")