Merge pull request #116 from edx/dan-f/upgrade-to-django-1.8

Upgrade to Django 1.8.13

analytics_data_api/v0/tests/views/test_problems.py

@@ -21,6 +21,7 @@ class AnswerDistributionTests(TestCaseWithAuthentication):
 
     @classmethod
     def setUpClass(cls):
+        super(AnswerDistributionTests, cls).setUpClass()
         cls.course_id = "org/num/run"
         cls.module_id1 = "i4x://org/num/run/problem/RANDOMNUMBER"
         cls.module_id2 = "i4x://org/num/run/problem/OTHERRANDOM"
@@ -141,6 +142,7 @@ class GradeDistributionTests(TestCaseWithAuthentication):
 
     @classmethod
     def setUpClass(cls):
+        super(GradeDistributionTests, cls).setUpClass()
         cls.course_id = "org/class/test"
         cls.module_id = "i4x://org/class/test/problem/RANDOM_NUMBER"
         cls.ad1 = G(
@@ -169,6 +171,7 @@ class SequentialOpenDistributionTests(TestCaseWithAuthentication):
 
     @classmethod
     def setUpClass(cls):
+        super(SequentialOpenDistributionTests, cls).setUpClass()
         cls.course_id = "org/class/test"
         cls.module_id = "i4x://org/class/test/problem/RANDOM_NUMBER"
         cls.ad1 = G(

analyticsdataserver/settings/base.py

@@ -234,6 +234,10 @@ LOGGING = {
             'class': 'logging.StreamHandler',
             'stream': stderr,
         },
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler'
+        }
     },
     'loggers': {
         'django': {
@@ -246,6 +250,21 @@ LOGGING = {
             'level': 'DEBUG',
             'propagate': True
         },
+        # See https://elasticutils.readthedocs.io/en/latest/debugging.html
+        # INFO-level logs tell us when nodes fail and are resurrected.
+        'elasticsearch': {
+            'handlers': ['console'],
+            'level': 'WARNING'
+        },
+        # elasticsearch.trace logs are fired for every single request
+        # with an INFO or DEBUG level.  They're noisy and not terribly
+        # userful for debugging, so we'll just propagate them to the
+        # 'elasticsearch' log bucket which only accepts 'WARNING'
+        # level logs.
+        'elasticsearch.trace': {
+            'handlers': ['null'],
+            'propagate': False
+        }
     },
 }
 ########## END LOGGING CONFIGURATION

analyticsdataserver/settings/test.py

@@ -14,6 +14,9 @@ DATABASES = {
     },
 }
 
+# Silence elasticsearch during tests
+LOGGING['loggers']['elasticsearch']['handlers'] = ['null']
+
 INSTALLED_APPS += (
     'django_nose',
 )

requirements/base.txt

 boto==2.22.1                        # MIT
-Django==1.7.5 						# BSD License
+Django==1.8.13 						# BSD License
 django-model-utils==2.2 			# BSD
 djangorestframework==2.4.4			# BSD
 django-rest-swagger==0.2.8  		# BSD

requirements/test.txt

@@ -4,7 +4,7 @@ coverage==3.7.1
 ddt==1.0.1
 diff-cover >= 0.2.1
 django-dynamic-fixture==1.8.1
-django-nose==1.4.1
+django-nose==1.4.3
 mock==1.0.1
 nose-exclude==0.2.0
 nose-ignore-docstring==0.2