From b095ce15c894f014ec0f3f2f44ef908596a2203f Mon Sep 17 00:00:00 2001 From: Anthony Wee Date: Tue, 7 May 2019 11:05:38 -0700 Subject: [PATCH] INCR-124: Run python-modernize on common/djangoapps/track/tests (#20445) * INCR-124: Run python-modernize on common/djangoapps/track/tests * isort --- common/djangoapps/track/tests/__init__.py | 8 ++++---- common/djangoapps/track/tests/test_contexts.py | 2 ++ common/djangoapps/track/tests/test_logs.py | 5 ++++- common/djangoapps/track/tests/test_middleware.py | 7 +++++-- common/djangoapps/track/tests/test_segment.py | 5 +++-- common/djangoapps/track/tests/test_shim.py | 4 +++- common/djangoapps/track/tests/test_tracker.py | 9 ++++++--- common/djangoapps/track/tests/test_util.py | 2 ++ 8 files changed, 29 insertions(+), 13 deletions(-) diff --git a/common/djangoapps/track/tests/__init__.py b/common/djangoapps/track/tests/__init__.py index a3363e1c2f..787c05d751 100644 --- a/common/djangoapps/track/tests/__init__.py +++ b/common/djangoapps/track/tests/__init__.py @@ -1,15 +1,15 @@ """Helpers for tests related to emitting events to the tracking logs.""" +from __future__ import absolute_import + from datetime import datetime from django.test import TestCase from django.test.utils import override_settings -from freezegun import freeze_time -from pytz import UTC - from eventtracking import tracker from eventtracking.django import DjangoTracker - +from freezegun import freeze_time +from pytz import UTC FROZEN_TIME = datetime(2013, 10, 3, 8, 24, 55, tzinfo=UTC) IN_MEMORY_BACKEND_CONFIG = { diff --git a/common/djangoapps/track/tests/test_contexts.py b/common/djangoapps/track/tests/test_contexts.py index 503ee88b77..584a6fe82b 100644 --- a/common/djangoapps/track/tests/test_contexts.py +++ b/common/djangoapps/track/tests/test_contexts.py @@ -1,5 +1,7 @@ # pylint: disable=missing-docstring +from __future__ import absolute_import + from unittest import TestCase import ddt diff --git a/common/djangoapps/track/tests/test_logs.py b/common/djangoapps/track/tests/test_logs.py index b6d6acd730..5711ee136c 100644 --- a/common/djangoapps/track/tests/test_logs.py +++ b/common/djangoapps/track/tests/test_logs.py @@ -1,10 +1,13 @@ """Tests that tracking data are successfully logged""" +from __future__ import absolute_import + import unittest import mock from django.conf import settings -from django.urls import reverse from django.test import TestCase +from django.urls import reverse +from six import unichr from track.models import TrackingLog from track.views import user_track diff --git a/common/djangoapps/track/tests/test_middleware.py b/common/djangoapps/track/tests/test_middleware.py index c56b426b60..8cf800f290 100644 --- a/common/djangoapps/track/tests/test_middleware.py +++ b/common/djangoapps/track/tests/test_middleware.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- """Tests for tracking middleware.""" +from __future__ import absolute_import + import ddt +import six from django.contrib.auth.models import User from django.contrib.sessions.middleware import SessionMiddleware from django.test import TestCase from django.test.client import RequestFactory from django.test.utils import override_settings +from eventtracking import tracker from mock import patch, sentinel -from eventtracking import tracker from track.middleware import TrackMiddleware @@ -152,7 +155,7 @@ class TrackMiddlewareTestCase(TestCase): def assert_dict_subset(self, superset, subset): """Assert that the superset dict contains all of the key-value pairs found in the subset dict.""" - for key, expected_value in subset.iteritems(): + for key, expected_value in six.iteritems(subset): self.assertEquals(superset[key], expected_value) def test_request_with_user(self): diff --git a/common/djangoapps/track/tests/test_segment.py b/common/djangoapps/track/tests/test_segment.py index 90f45a5178..2c8ecd2dfe 100644 --- a/common/djangoapps/track/tests/test_segment.py +++ b/common/djangoapps/track/tests/test_segment.py @@ -1,12 +1,13 @@ """Ensure emitted events contain the fields legacy processors expect to find.""" -import ddt +from __future__ import absolute_import +import ddt from django.test import TestCase from django.test.utils import override_settings from eventtracking import tracker from eventtracking.django import DjangoTracker -from mock import sentinel, patch +from mock import patch, sentinel from track import segment diff --git a/common/djangoapps/track/tests/test_shim.py b/common/djangoapps/track/tests/test_shim.py index c5f975663a..245b233810 100644 --- a/common/djangoapps/track/tests/test_shim.py +++ b/common/djangoapps/track/tests/test_shim.py @@ -1,5 +1,7 @@ """Ensure emitted events contain the fields legacy processors expect to find.""" +from __future__ import absolute_import + from collections import namedtuple import ddt @@ -8,9 +10,9 @@ from mock import sentinel from openedx.core.lib.tests.assertions.events import assert_events_equal -from . import FROZEN_TIME, EventTrackingTestCase from .. import transformers from ..shim import PrefixedEventProcessor +from . import FROZEN_TIME, EventTrackingTestCase LEGACY_SHIM_PROCESSOR = [ { diff --git a/common/djangoapps/track/tests/test_tracker.py b/common/djangoapps/track/tests/test_tracker.py index 9b3fc76440..e3c91d8e3c 100644 --- a/common/djangoapps/track/tests/test_tracker.py +++ b/common/djangoapps/track/tests/test_tracker.py @@ -1,6 +1,9 @@ +from __future__ import absolute_import + from django.conf import settings from django.test import TestCase from django.test.utils import override_settings +from six.moves import range import track.tracker as tracker from track.backends import BaseBackend @@ -70,18 +73,18 @@ class TestTrackerDjangoInstantiation(TestCase): tracker.send({}) - self.assertEqual(backends.values()[0].count, 1) + self.assertEqual(list(backends.values())[0].count, 1) @override_settings(TRACKING_BACKENDS=MULTI_SETTINGS.copy()) def test_django_multi_settings(self): """Test if multiple backends can be configured properly.""" - backends = self._reload_backends().values() + backends = list(self._reload_backends().values()) self.assertEqual(len(backends), 2) event_count = 10 - for _ in xrange(event_count): + for _ in range(event_count): tracker.send({}) self.assertEqual(backends[0].count, event_count) diff --git a/common/djangoapps/track/tests/test_util.py b/common/djangoapps/track/tests/test_util.py index bcbc6efc34..93a84a81b3 100644 --- a/common/djangoapps/track/tests/test_util.py +++ b/common/djangoapps/track/tests/test_util.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + import json from datetime import datetime