From 9c9f38e4e9602af0a1215cc90ec09b2d820e98ab Mon Sep 17 00:00:00 2001
From: Amit <43564590+amitvadhel@users.noreply.github.com>
Date: Fri, 24 May 2019 21:20:03 +0300
Subject: [PATCH] INCR-251: Make compatible with Python 3.x without breaking
Python 2.7 support --> common/test/acceptance/tests/discussion (#20646)
---
common/test/acceptance/tests/discussion/helpers.py | 4 ++++
.../acceptance/tests/discussion/test_cohort_management.py | 2 ++
common/test/acceptance/tests/discussion/test_cohorts.py | 2 ++
common/test/acceptance/tests/discussion/test_discussion.py | 4 +++-
.../acceptance/tests/discussion/test_discussion_management.py | 2 ++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/common/test/acceptance/tests/discussion/helpers.py b/common/test/acceptance/tests/discussion/helpers.py
index 677592e7b3b..74097d49c3c 100644
--- a/common/test/acceptance/tests/discussion/helpers.py
+++ b/common/test/acceptance/tests/discussion/helpers.py
@@ -2,9 +2,13 @@
Helper functions and classes for discussion tests.
"""
+from __future__ import absolute_import
+
import json
from uuid import uuid4
+from six.moves import range
+
from common.test.acceptance.fixtures import LMS_BASE_URL
from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from common.test.acceptance.fixtures.discussion import (
diff --git a/common/test/acceptance/tests/discussion/test_cohort_management.py b/common/test/acceptance/tests/discussion/test_cohort_management.py
index 1fc57f7a185..fd960695da3 100644
--- a/common/test/acceptance/tests/discussion/test_cohort_management.py
+++ b/common/test/acceptance/tests/discussion/test_cohort_management.py
@@ -3,6 +3,8 @@
End-to-end tests related to the cohort management on the LMS Instructor Dashboard
"""
+from __future__ import absolute_import
+
import os
import uuid
from datetime import datetime
diff --git a/common/test/acceptance/tests/discussion/test_cohorts.py b/common/test/acceptance/tests/discussion/test_cohorts.py
index f4cf7235f94..e6f278a9ca4 100644
--- a/common/test/acceptance/tests/discussion/test_cohorts.py
+++ b/common/test/acceptance/tests/discussion/test_cohorts.py
@@ -1,6 +1,8 @@
"""
Tests related to the cohorting feature.
"""
+from __future__ import absolute_import
+
from uuid import uuid4
from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index 7760af2b03a..6703bb39c96 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -2,6 +2,8 @@
Tests for discussion pages
"""
+from __future__ import absolute_import
+
import datetime
import time
from unittest import skip
@@ -9,6 +11,7 @@ from uuid import uuid4
import pytest
from pytz import UTC
+from six.moves import map
from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
from common.test.acceptance.fixtures.discussion import (
@@ -35,7 +38,6 @@ from common.test.acceptance.tests.discussion.helpers import BaseDiscussionMixin,
from common.test.acceptance.tests.helpers import UniqueCourseTest, get_modal_alert, skip_if_browser
from openedx.core.lib.tests import attr
-
THREAD_CONTENT_WITH_LATEX = u"""Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
diff --git a/common/test/acceptance/tests/discussion/test_discussion_management.py b/common/test/acceptance/tests/discussion/test_discussion_management.py
index a1af93790f6..d8a3ebe8508 100644
--- a/common/test/acceptance/tests/discussion/test_discussion_management.py
+++ b/common/test/acceptance/tests/discussion/test_discussion_management.py
@@ -3,6 +3,8 @@
End-to-end tests related to the divided discussion management on the LMS Instructor Dashboard
"""
+from __future__ import absolute_import
+
import uuid
from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
--
GitLab