Skip to content
Snippets Groups Projects
Commit 4e1f63bd authored by Stu Young's avatar Stu Young Committed by Christie Rice
Browse files

INCR-283 Run python-modernize on lms/djangoapps/program_enrollments/migrations...

INCR-283 Run python-modernize on lms/djangoapps/program_enrollments/migrations and lms/djangoapps/program_enrollments/tests (#20578)

* run python modernize

* run isort

* Fix merge conflicts

* Fix merge conflict--file was deleted on master
parent dcb92bdf
No related branches found
No related tags found
No related merge requests found
"""
Factories for Program Enrollment tests.
"""
from __future__ import absolute_import
from uuid import uuid4
import factory
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-04-09 19:32
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import model_utils.fields
import simple_history.models
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-04-19 16:48
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
import model_utils.fields
import opaque_keys.edx.django.models
import simple_history.models
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-04-24 16:22
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
from django.conf import settings
from django.db import migrations
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-05-01 21:46
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
......
"""
Unit tests for the ProgramEnrollment admin classes.
"""
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
import mock
from django.contrib.admin.sites import AdminSite
from django.test import TestCase
import mock
from lms.djangoapps.program_enrollments.admin import ProgramEnrollmentAdmin, ProgramCourseEnrollmentAdmin
from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment
from lms.djangoapps.program_enrollments.admin import ProgramCourseEnrollmentAdmin, ProgramEnrollmentAdmin
from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment
class ProgramEnrollmentAdminTests(TestCase):
......
"""
Unit tests for ProgramEnrollment models.
"""
from __future__ import unicode_literals
from __future__ import absolute_import, unicode_literals
from uuid import uuid4
from testfixtures import LogCapture
from django.test import TestCase
from opaque_keys.edx.keys import CourseKey
from six.moves import range
from testfixtures import LogCapture
from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment
from student.tests.factories import UserFactory, CourseEnrollmentFactory
from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment
from openedx.core.djangoapps.catalog.tests.factories import generate_course_run_key
from student.tests.factories import CourseEnrollmentFactory, UserFactory
class ProgramEnrollmentModelTests(TestCase):
......@@ -40,7 +41,7 @@ class ProgramEnrollmentModelTests(TestCase):
enrollments = []
student_data = {}
for i in xrange(5):
for i in range(5):
# This will give us 4 program enrollments for self.program_uuid
# and 1 enrollment for self.other_program_uuid
user_curriculum = curriculum_b if i % 2 else curriculum_a
......@@ -77,7 +78,7 @@ class ProgramEnrollmentModelTests(TestCase):
def test_user_retirement(self):
"""
Test that the external_user_key is uccessfully retired for a user's program enrollments and history.
Test that the external_user_key is successfully retired for a user's program enrollments and history.
"""
new_status = 'withdrawn'
......
"""
Unit tests for program_enrollments utils.
"""
from __future__ import absolute_import
from uuid import uuid4
import pytest
from django.core.cache import cache
from organizations.tests.factories import OrganizationFactory
from social_django.models import UserSocialAuth
from openedx.core.djangoapps.catalog.cache import PROGRAM_CACHE_KEY_TPL
from openedx.core.djangoapps.catalog.tests.factories import (
OrganizationFactory as CatalogOrganizationFactory, ProgramFactory
)
from openedx.core.djangoapps.catalog.tests.factories import OrganizationFactory as CatalogOrganizationFactory
from openedx.core.djangoapps.catalog.tests.factories import ProgramFactory
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from organizations.tests.factories import OrganizationFactory
from program_enrollments.utils import (
get_user_by_program_id, ProgramDoesNotExistException, OrganizationDoesNotExistException,
ProviderDoesNotExistException
OrganizationDoesNotExistException,
ProgramDoesNotExistException,
ProviderDoesNotExistException,
get_user_by_program_id
)
from social_django.models import UserSocialAuth
from student.tests.factories import UserFactory
from third_party_auth.tests.factories import SAMLProviderConfigFactory
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment