diff --git a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py index 7fb1076908..53840cbddd 100644 --- a/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py +++ b/common/djangoapps/student/management/tests/test_bulk_change_enrollment.py @@ -1,19 +1,19 @@ """Tests for the bulk_change_enrollment command.""" -import ddt -from six import text_type +from __future__ import absolute_import +import ddt from django.core.management import call_command from django.core.management.base import CommandError -from mock import patch, call +from mock import call, patch +from six import text_type from course_modes.tests.factories import CourseModeFactory -from student.tests.factories import UserFactory, CourseEnrollmentFactory -from student.models import CourseEnrollment, EVENT_NAME_ENROLLMENT_MODE_CHANGED +from openedx.core.djangoapps.content.course_overviews.models import CourseOverview +from student.models import EVENT_NAME_ENROLLMENT_MODE_CHANGED, CourseEnrollment +from student.tests.factories import CourseEnrollmentFactory, UserFactory from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -from openedx.core.djangoapps.content.course_overviews.models import CourseOverview - @ddt.ddt class BulkChangeEnrollmentTests(SharedModuleStoreTestCase): diff --git a/common/djangoapps/student/management/tests/test_bulk_change_enrollment_csv.py b/common/djangoapps/student/management/tests/test_bulk_change_enrollment_csv.py index 4f6ceb2f61..fe83d3d396 100644 --- a/common/djangoapps/student/management/tests/test_bulk_change_enrollment_csv.py +++ b/common/djangoapps/student/management/tests/test_bulk_change_enrollment_csv.py @@ -1,17 +1,18 @@ -from tempfile import NamedTemporaryFile +from __future__ import absolute_import + import unittest +from tempfile import NamedTemporaryFile from django.conf import settings from django.core.management import call_command -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory from testfixtures import LogCapture -from course_modes.tests.factories import CourseModeFactory from course_modes.models import CourseMode -from student.tests.factories import UserFactory +from course_modes.tests.factories import CourseModeFactory from student.models import CourseEnrollment - +from student.tests.factories import UserFactory +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory LOGGER_NAME = 'student.management.commands.bulk_change_enrollment_csv' diff --git a/common/djangoapps/student/management/tests/test_bulk_unenroll.py b/common/djangoapps/student/management/tests/test_bulk_unenroll.py index d9984a0d42..55906eb1e4 100644 --- a/common/djangoapps/student/management/tests/test_bulk_unenroll.py +++ b/common/djangoapps/student/management/tests/test_bulk_unenroll.py @@ -1,14 +1,15 @@ +from __future__ import absolute_import + from tempfile import NamedTemporaryFile from django.core.management import call_command -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory from testfixtures import LogCapture from course_modes.tests.factories import CourseModeFactory -from student.tests.factories import UserFactory from student.models import CourseEnrollment - +from student.tests.factories import UserFactory +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory LOGGER_NAME = 'student.management.commands.bulk_unenroll' diff --git a/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py b/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py index 8bc4189bcb..7eb0c4b791 100644 --- a/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py +++ b/common/djangoapps/student/management/tests/test_change_eligibility_deadline.py @@ -1,19 +1,21 @@ """ Test the change_eligibility_deadline command line script.""" +from __future__ import absolute_import + from datetime import datetime, timedelta -from course_modes.tests.factories import CourseMode from django.core.management import call_command from opaque_keys import InvalidKeyError from six import text_type +from testfixtures import LogCapture + +from course_modes.tests.factories import CourseMode +from openedx.core.djangoapps.credit.models import CreditCourse, CreditEligibility from student.models import CourseEnrollment, User from student.tests.factories import UserFactory -from testfixtures import LogCapture from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -from openedx.core.djangoapps.credit.models import CreditCourse, CreditEligibility - LOGGER_NAME = 'student.management.commands.change_eligibility_deadline' command_args = '--username {username} --course {course} --date {date}' diff --git a/common/djangoapps/student/management/tests/test_change_enrollment.py b/common/djangoapps/student/management/tests/test_change_enrollment.py index 503f8a3d65..72f2c92970 100644 --- a/common/djangoapps/student/management/tests/test_change_enrollment.py +++ b/common/djangoapps/student/management/tests/test_change_enrollment.py @@ -1,16 +1,17 @@ """ Test the change_enrollment command line script.""" +from __future__ import absolute_import + import ddt +from django.core.management import call_command from mock import patch from six import text_type -from django.core.management import call_command -from xmodule.modulestore.tests.factories import CourseFactory -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase - from course_modes.tests.factories import CourseModeFactory -from student.tests.factories import UserFactory from student.models import CourseEnrollment +from student.tests.factories import UserFactory +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory @ddt.ddt diff --git a/common/djangoapps/student/management/tests/test_change_enterprise_user_username.py b/common/djangoapps/student/management/tests/test_change_enterprise_user_username.py index fa7e14ed12..17cc44ce80 100644 --- a/common/djangoapps/student/management/tests/test_change_enterprise_user_username.py +++ b/common/djangoapps/student/management/tests/test_change_enterprise_user_username.py @@ -5,15 +5,13 @@ Tests for the django management command `change_enterprise_user_username`. from __future__ import absolute_import, unicode_literals import mock -from pytest import mark - from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.core.management import call_command from django.db.models.signals import post_save from django.test import TestCase - from enterprise.models import EnterpriseCustomer, EnterpriseCustomerUser +from pytest import mark @mark.django_db diff --git a/common/djangoapps/student/management/tests/test_create_random_users.py b/common/djangoapps/student/management/tests/test_create_random_users.py index a0b9d65888..fb7d009009 100644 --- a/common/djangoapps/student/management/tests/test_create_random_users.py +++ b/common/djangoapps/student/management/tests/test_create_random_users.py @@ -2,16 +2,17 @@ Test the create_random_users command line script """ -from six import text_type +from __future__ import absolute_import import pytest from django.contrib.auth import get_user_model from django.core.management import call_command from opaque_keys import InvalidKeyError -from xmodule.modulestore.tests.factories import CourseFactory -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from six import text_type from student.models import CourseEnrollment +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory class CreateRandomUserTests(SharedModuleStoreTestCase): diff --git a/common/djangoapps/student/management/tests/test_create_user.py b/common/djangoapps/student/management/tests/test_create_user.py index 903d43faa7..6e7308e469 100644 --- a/common/djangoapps/student/management/tests/test_create_user.py +++ b/common/djangoapps/student/management/tests/test_create_user.py @@ -2,15 +2,16 @@ Test the create_user command line script """ -from six import text_type +from __future__ import absolute_import from django.contrib.auth import get_user_model from django.core.management import call_command -from xmodule.modulestore.tests.factories import CourseFactory -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from six import text_type from course_modes.models import CourseMode from student.models import CourseEnrollment, UserProfile +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory class CreateUserMgmtTests(SharedModuleStoreTestCase): diff --git a/common/djangoapps/student/management/tests/test_manage_group.py b/common/djangoapps/student/management/tests/test_manage_group.py index b0eb1934e4..eb480ab2f1 100644 --- a/common/djangoapps/student/management/tests/test_manage_group.py +++ b/common/djangoapps/student/management/tests/test_manage_group.py @@ -1,12 +1,14 @@ """ Unit tests for user_management management commands. """ +from __future__ import absolute_import + import sys import ddt from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType -from django.core.management import call_command, CommandError +from django.core.management import CommandError, call_command from django.test import TestCase TEST_EMAIL = 'test@example.com' @@ -48,7 +50,7 @@ class TestManageGroupCommand(TestCase): Checks that the current state of the database matches the specified groups and permissions. """ - self.check_groups(group_permissions.keys()) + self.check_groups(list(group_permissions.keys())) for group_name, permission_codenames in group_permissions.items(): self.check_permissions(group_name, permission_codenames) diff --git a/common/djangoapps/student/management/tests/test_manage_user.py b/common/djangoapps/student/management/tests/test_manage_user.py index 7daaad7249..e4c6ee05ac 100644 --- a/common/djangoapps/student/management/tests/test_manage_user.py +++ b/common/djangoapps/student/management/tests/test_manage_user.py @@ -1,12 +1,14 @@ """ Unit tests for user_management management commands. """ +from __future__ import absolute_import + import itertools import ddt from django.contrib.auth.hashers import make_password from django.contrib.auth.models import Group, User -from django.core.management import call_command, CommandError +from django.core.management import CommandError, call_command from django.test import TestCase from openedx.core.djangoapps.user_api.accounts.utils import generate_password diff --git a/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py b/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py index 244211e303..e19bf6c697 100644 --- a/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py +++ b/common/djangoapps/student/management/tests/test_populate_created_on_site_user_attribute.py @@ -1,15 +1,19 @@ """ Unittests for populate_created_on_site_user_attribute management command. """ +from __future__ import absolute_import + import ddt import mock -from django.test import TestCase from django.contrib.auth.models import User -from django.core.management import call_command, CommandError +from django.core.management import CommandError, call_command +from django.test import TestCase +from six.moves import range +from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin from student.models import Registration, UserAttribute from student.tests.factories import UserFactory -from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin + CREATED_ON_SITE = 'created_on_site' diff --git a/common/djangoapps/student/management/tests/test_transfer_students.py b/common/djangoapps/student/management/tests/test_transfer_students.py index 1b8ab9f087..1a06dc4556 100644 --- a/common/djangoapps/student/management/tests/test_transfer_students.py +++ b/common/djangoapps/student/management/tests/test_transfer_students.py @@ -1,16 +1,18 @@ """ Tests the transfer student management command """ +from __future__ import absolute_import + import unittest -from mock import call, patch -from six import text_type - import ddt -from course_modes.models import CourseMode from django.conf import settings from django.core.management import call_command +from mock import call, patch from opaque_keys.edx import locator +from six import text_type + +from course_modes.models import CourseMode from shoppingcart.models import CertificateItem, Order # pylint: disable=import-error from student.models import ( EVENT_NAME_ENROLLMENT_ACTIVATED,