diff --git a/openedx/features/course_duration_limits/tests/test_course_expiration.py b/openedx/features/course_duration_limits/tests/test_course_expiration.py index d50f27020c..54470bb702 100644 --- a/openedx/features/course_duration_limits/tests/test_course_expiration.py +++ b/openedx/features/course_duration_limits/tests/test_course_expiration.py @@ -3,15 +3,18 @@ Contains tests to verify correctness of course expiration functionality """ from datetime import timedelta +from unittest import mock import ddt -from unittest import mock import six from django.conf import settings from django.urls import reverse from django.utils.timezone import now from common.djangoapps.course_modes.models import CourseMode +from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion +from common.djangoapps.student.roles import CourseInstructorRole +from common.djangoapps.student.tests.factories import TEST_PASSWORD, CourseEnrollmentFactory, UserFactory from lms.djangoapps.courseware.tests.factories import ( BetaTesterFactory, GlobalStaffFactory, @@ -35,9 +38,6 @@ from openedx.features.content_type_gating.helpers import CONTENT_GATING_PARTITIO from openedx.features.course_duration_limits.access import get_user_course_expiration_date from openedx.features.course_duration_limits.models import CourseDurationLimitConfig from openedx.features.course_experience.tests.views.helpers import add_course_mode -from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion -from common.djangoapps.student.roles import CourseInstructorRole -from common.djangoapps.student.tests.factories import TEST_PASSWORD, CourseEnrollmentFactory, UserFactory from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory from xmodule.partitions.partitions import ENROLLMENT_TRACK_PARTITION_ID diff --git a/openedx/features/course_duration_limits/tests/test_models.py b/openedx/features/course_duration_limits/tests/test_models.py index 6d4a66cce5..0473faefd3 100644 --- a/openedx/features/course_duration_limits/tests/test_models.py +++ b/openedx/features/course_duration_limits/tests/test_models.py @@ -4,13 +4,13 @@ Tests of CourseDurationLimitConfig. import itertools from datetime import datetime, timedelta +from unittest.mock import Mock import ddt import pytest import pytz from django.utils import timezone from edx_django_utils.cache import RequestCache -from unittest.mock import Mock from opaque_keys.edx.locator import CourseLocator from common.djangoapps.course_modes.tests.factories import CourseModeFactory