Merge pull request #17112 from edx/jeskew/fix_static_asset_pipeline_tests_django1.9

Fix static asset pipeline tests in Django 1.9.

common/djangoapps/pipeline_mako/tests/test_render.py

@@ -3,6 +3,7 @@
 from unittest import skipUnless
 
 import ddt
+import os
 from django.conf import settings
 from django.test import TestCase
 from paver.easy import call_task
@@ -49,6 +50,19 @@ class PipelineRenderTest(TestCase):
         Create static assets once for all pipeline render tests.
         """
         super(PipelineRenderTest, cls).setUpClass()
+        # Ensure that the npm requirements are always installed before updating static assets.
+        prereq_install_value_orig = os.environ.get('NO_PREREQ_INSTALL')
+        os.environ['NO_PREREQ_INSTALL'] = 'False'
+        try:
+            call_task('pavelib.prereqs.install_node_prereqs')
+        except:
+            raise
+        finally:
+            if prereq_install_value_orig is None:
+                del os.environ['NO_PREREQ_INSTALL']
+            else:
+                os.environ['NO_PREREQ_INSTALL'] = prereq_install_value_orig
+        # Update all static assets.
         call_task('pavelib.assets.update_assets', args=('lms', '--settings=test', '--themes=no'))
 
     @skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in LMS')

common/djangoapps/util/tests/test_db.py

@@ -5,6 +5,7 @@ import time
 import unittest
 
 import ddt
+import django
 import pytest
 from django.contrib.auth.models import User
 from django.core.management import call_command
@@ -234,6 +235,11 @@ class MigrationTests(TestCase):
         make a migrationless release that'll require a separate migration
         release afterwards, this test doesn't fail.
         """
+        # TODO: Remove Django 1.11 upgrade shim
+        # SHIM: Migrations are known to be needed when actually bumping the Django version number.
+        if django.VERSION >= (1, 9):
+            pytest.skip("Migrations are known to be needed for Django 1.9+!")
+
         out = StringIO()
         call_command('makemigrations', dry_run=True, verbosity=3, stdout=out)
         output = out.getvalue()