fix expired message on dashboard and some of the tests

openedx/features/course_duration_limits/access.py

@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+"""
+Contains code related to computing content gating course duration limits
+and course access based on these limits.
+"""
 from datetime import timedelta
 
 from django.apps import apps
@@ -16,11 +21,15 @@ class AuditExpiredError(AccessError):
     def __init__(self, user, course, end_date):
         error_code = "audit_expired"
         developer_message = "User {} had access to {} until {}".format(user, course, end_date)
-        user_message = _("Your audit access period has expired.")
+        # TODO: Translate the end_date
+        user_message = _("Course access expired on ") + end_date.strftime("%B %d, %Y")
         super(AuditExpiredError, self).__init__(error_code, developer_message, user_message)
 
 
 def check_course_expired(user, course):
+    """
+    Check if the course expired for the user.
+    """
     # TODO: Only limit audit users
     # TODO: Limit access to instructor paced courses based on end-date, rather than content availability date
     CourseEnrollment = apps.get_model('student.CourseEnrollment')

openedx/features/course_duration_limits/admin.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.contrib import admin
-
-# Register your models here.

openedx/features/course_duration_limits/apps.py

@@ -1,3 +1,6 @@
+"""
+Course duration limits application configuration
+"""
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 

openedx/features/course_duration_limits/models.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models
-
-# Create your models here.

openedx/features/course_duration_limits/tests.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.test import TestCase
-
-# Create your tests here.

openedx/features/course_duration_limits/views.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.shortcuts import render
-
-# Create your views here.

openedx/features/course_experience/tests/views/test_course_home.py

@@ -173,7 +173,7 @@ class TestCourseHomePage(CourseHomePageTestCase):
         course_home_url(self.course)
 
         # Fetch the view and verify the query counts
-        with self.assertNumQueries(54, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(66, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
             with check_mongo_calls(4):
                 url = course_home_url(self.course)
                 self.client.get(url)

openedx/features/course_experience/tests/views/test_course_updates.py

@@ -124,7 +124,7 @@ class TestCourseUpdatesPage(SharedModuleStoreTestCase):
         course_updates_url(self.course)
 
         # Fetch the view and verify that the query counts haven't changed
-        with self.assertNumQueries(34, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
+        with self.assertNumQueries(38, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
             with check_mongo_calls(4):
                 url = course_updates_url(self.course)
                 self.client.get(url)