Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance"

This reverts commit f97f052591, reversing
changes made to 800bcd8e20.

common/test/acceptance/tests/discussion/test_cohort_management.py

@@ -3,22 +3,22 @@
 End-to-end tests related to the cohort management on the LMS Instructor Dashboard
 """
 
-import os
-import uuid
 from datetime import datetime
 
-import unicodecsv
+from pytz import UTC, utc
 from bok_choy.promise import EmptyPromise
 from nose.plugins.attrib import attr
-from pytz import UTC, utc
-
+from common.test.acceptance.tests.discussion.helpers import CohortTestMixin
+from common.test.acceptance.tests.helpers import UniqueCourseTest, EventsTestMixin, create_user_partition_json
+from xmodule.partitions.partitions import Group
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
 from common.test.acceptance.pages.lms.auto_auth import AutoAuthPage
-from common.test.acceptance.pages.lms.instructor_dashboard import DataDownloadPage, InstructorDashboardPage
+from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage, DataDownloadPage
 from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
-from common.test.acceptance.tests.discussion.helpers import CohortTestMixin
-from common.test.acceptance.tests.helpers import EventsTestMixin, UniqueCourseTest, create_user_partition_json
-from openedx.core.lib.partitions.partitions import Group
+
+import os
+import unicodecsv
+import uuid
 
 
 @attr(shard=8)

common/test/acceptance/tests/helpers.py

@@ -2,40 +2,42 @@
 Test helper functions and base classes.
 """
 
-import functools
 import inspect
 import json
-import operator
-import os
-import pprint
 import unittest
+import functools
+import operator
+import pprint
+import requests
+import os
 import urlparse
 from contextlib import contextmanager
 from datetime import datetime
-from unittest import TestCase
-
-import requests
-from bok_choy.javascript import js_defined
-from bok_choy.page_object import XSS_INJECTION
-from bok_choy.promise import EmptyPromise, Promise
-from bok_choy.web_app_test import WebAppTest
-from opaque_keys.edx.locator import CourseLocator
 from path import Path as path
-from pymongo import ASCENDING, MongoClient
+
+from bok_choy.javascript import js_defined
+from bok_choy.web_app_test import WebAppTest
+from bok_choy.promise import EmptyPromise, Promise
+from bok_choy.page_object import XSS_INJECTION
+from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
+from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
+from common.test.acceptance.fixtures.course import XBlockFixtureDesc
+from opaque_keys.edx.locator import CourseLocator
+from pymongo import MongoClient, ASCENDING
+from openedx.core.lib.tests.assertions.events import assert_event_matches, is_matching_event, EventMatchTolerates
+from xmodule.partitions.partitions import UserPartition
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from selenium.webdriver.common.keys import Keys
-from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.select import Select
 from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from unittest import TestCase
+
+from openedx.core.release import doc_version, RELEASE_LINE
 
-from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory
-from common.test.acceptance.fixtures.course import XBlockFixtureDesc
 from common.test.acceptance.pages.common import BASE_URL
-from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
-from openedx.core.lib.partitions.partitions import UserPartition
-from openedx.core.lib.tests.assertions.events import EventMatchTolerates, assert_event_matches, is_matching_event
-from openedx.core.release import RELEASE_LINE, doc_version
+
 
 MAX_EVENTS_IN_FAILURE_OUTPUT = 20
 

common/test/acceptance/tests/lms/test_lms_split_test_courseware_search.py

@@ -4,16 +4,20 @@ Test courseware search
 
 import json
 
+from common.test.acceptance.tests.helpers import remove_file
+from common.test.acceptance.pages.common.logout import LogoutPage
+from common.test.acceptance.pages.studio.overview import CourseOutlinePage as StudioCourseOutlinePage
+from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage
+from common.test.acceptance.fixtures.course import XBlockFixtureDesc
+from common.test.acceptance.tests.helpers import create_user_partition_json
+
+from xmodule.partitions.partitions import Group
+
 from nose.plugins.attrib import attr
 
-from common.test.acceptance.fixtures.course import XBlockFixtureDesc
-from common.test.acceptance.pages.common.logout import LogoutPage
-from common.test.acceptance.pages.lms.courseware_search import CoursewareSearchPage
-from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
-from common.test.acceptance.pages.studio.overview import CourseOutlinePage as StudioCourseOutlinePage
-from common.test.acceptance.tests.helpers import create_user_partition_json, remove_file
 from common.test.acceptance.tests.studio.base_studio_test import ContainerBase
-from openedx.core.lib.partitions.partitions import Group
+
+from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage as StudioAutoAuthPage
 
 
 @attr(shard=1)

common/test/acceptance/tests/lms/test_lms_user_preview.py

@@ -4,17 +4,17 @@ Tests the "preview" selector in the LMS that allows changing between Staff, Lear
 """
 
 
-from textwrap import dedent
-
 from nose.plugins.attrib import attr
 
-from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
+from common.test.acceptance.tests.helpers import UniqueCourseTest, create_user_partition_json
+from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
 from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.pages.lms.instructor_dashboard import InstructorDashboardPage
 from common.test.acceptance.pages.lms.staff_view import StaffCoursewarePage
-from common.test.acceptance.pages.studio.auto_auth import AutoAuthPage
-from common.test.acceptance.tests.helpers import UniqueCourseTest, create_user_partition_json
-from openedx.core.lib.partitions.partitions import ENROLLMENT_TRACK_PARTITION_ID, MINIMUM_STATIC_PARTITION_ID, Group
+from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
+from bok_choy.promise import EmptyPromise
+from xmodule.partitions.partitions import (Group, ENROLLMENT_TRACK_PARTITION_ID, MINIMUM_STATIC_PARTITION_ID)
+from textwrap import dedent
 
 
 @attr(shard=10)

common/test/acceptance/tests/studio/test_studio_container.py

@@ -4,23 +4,26 @@ The container page is used both for displaying units, and
 for displaying containers within units.
 """
 import datetime
-from unittest import skip
-
 import ddt
 from nose.plugins.attrib import attr
+from unittest import skip
 
 from base_studio_test import ContainerBase
+
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
-from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.pages.lms.create_mode import ModeCreationPage
-from common.test.acceptance.pages.lms.staff_view import StaffCoursewarePage
 from common.test.acceptance.pages.studio.component_editor import ComponentEditorView, ComponentVisibilityEditorView
 from common.test.acceptance.pages.studio.container import ContainerPage
 from common.test.acceptance.pages.studio.html_component_editor import HtmlComponentEditorView
 from common.test.acceptance.pages.studio.move_xblock import MoveModalView
 from common.test.acceptance.pages.studio.utils import add_discussion, drag
+from common.test.acceptance.pages.lms.courseware import CoursewarePage
+from common.test.acceptance.pages.lms.staff_view import StaffCoursewarePage
 from common.test.acceptance.tests.helpers import create_user_partition_json
-from openedx.core.lib.partitions.partitions import ENROLLMENT_TRACK_PARTITION_ID, MINIMUM_STATIC_PARTITION_ID, Group
+
+from xmodule.partitions.partitions import (
+    Group, ENROLLMENT_TRACK_PARTITION_ID, MINIMUM_STATIC_PARTITION_ID
+)
 
 
 class NestedVerticalTest(ContainerBase):

common/test/acceptance/tests/studio/test_studio_settings.py

@@ -3,9 +3,10 @@
 Acceptance tests for Studio's Setting pages
 """
 from __future__ import unicode_literals
-
 import os
-from textwrap import dedent
+
+from mock import patch
+from nose.plugins.attrib import attr
 
 from bok_choy.promise import EmptyPromise
 from mock import patch
@@ -13,15 +14,17 @@ from nose.plugins.attrib import attr
 
 from base_studio_test import StudioCourseTest
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
-from common.test.acceptance.pages.common.utils import add_enrollment_course_modes
-from common.test.acceptance.pages.lms.courseware import CoursewarePage
+from common.test.acceptance.tests.helpers import create_user_partition_json, element_has_text
 from common.test.acceptance.pages.studio.overview import CourseOutlinePage
 from common.test.acceptance.pages.studio.settings import SettingsPage
 from common.test.acceptance.pages.studio.settings_advanced import AdvancedSettingsPage
 from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
+from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.pages.studio.utils import get_input_value
-from common.test.acceptance.tests.helpers import create_user_partition_json, element_has_text
-from openedx.core.lib.partitions.partitions import Group
+from common.test.acceptance.pages.common.utils import add_enrollment_course_modes
+
+from textwrap import dedent
+from xmodule.partitions.partitions import Group
 
 
 @attr(shard=8)

common/test/acceptance/tests/studio/test_studio_split_test.py

@@ -4,22 +4,24 @@ Acceptance tests for Studio related to the split_test module.
 
 import math
 from unittest import skip
-
-from bok_choy.promise import Promise
 from nose.plugins.attrib import attr
 from selenium.webdriver.support.ui import Select
 
-from base_studio_test import StudioCourseTest
+from xmodule.partitions.partitions import Group
+from bok_choy.promise import Promise, EmptyPromise
+
 from common.test.acceptance.fixtures.course import XBlockFixtureDesc
-from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.pages.studio.component_editor import ComponentEditorView
-from common.test.acceptance.pages.studio.container import ContainerPage
 from common.test.acceptance.pages.studio.overview import CourseOutlinePage, CourseOutlineUnit
+from common.test.acceptance.pages.studio.container import ContainerPage
 from common.test.acceptance.pages.studio.settings_group_configurations import GroupConfigurationsPage
 from common.test.acceptance.pages.studio.utils import add_advanced_component
 from common.test.acceptance.pages.xblock.utils import wait_for_xblock_initialization
+from common.test.acceptance.pages.lms.courseware import CoursewarePage
 from common.test.acceptance.tests.helpers import create_user_partition_json
-from openedx.core.lib.partitions.partitions import Group
+
+from base_studio_test import StudioCourseTest
+
 from test_studio_container import ContainerBase