From c0264ca81d6e2091aa2fa1e89c2eeb017274888c Mon Sep 17 00:00:00 2001 From: Christine Lytwynec Date: Tue, 29 Jul 2014 09:44:59 -0400 Subject: [PATCH] add shard_1 flags to cms bok-choy tests --- common/test/acceptance/tests/test_studio_acid_xblock.py | 5 ++++- common/test/acceptance/tests/test_studio_container.py | 8 +++++++- common/test/acceptance/tests/test_studio_general.py | 6 ++++++ common/test/acceptance/tests/test_studio_split_test.py | 4 ++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/common/test/acceptance/tests/test_studio_acid_xblock.py b/common/test/acceptance/tests/test_studio_acid_xblock.py index f3aa2429f6..617fc796be 100644 --- a/common/test/acceptance/tests/test_studio_acid_xblock.py +++ b/common/test/acceptance/tests/test_studio_acid_xblock.py @@ -2,7 +2,7 @@ Acceptance tests for Studio related to the acid xblock. """ from unittest import skip - +from nose.plugins.attrib import attr from bok_choy.web_app_test import WebAppTest from ..pages.studio.auto_auth import AutoAuthPage @@ -11,6 +11,7 @@ from ..pages.xblock.acid import AcidView from ..fixtures.course import CourseFixture, XBlockFixtureDesc +@attr('shard_1') class XBlockAcidBase(WebAppTest): """ Base class for tests that verify that XBlock integration is working correctly @@ -121,6 +122,7 @@ class XBlockAcidNoChildTest(XBlockAcidBase): self.user = course_fix.user +@attr('shard_1') class XBlockAcidParentBase(XBlockAcidBase): """ Base class for tests that verify that parent XBlock integration is working correctly @@ -178,6 +180,7 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase): self.user = course_fix.user +@attr('shard_1') class XBlockAcidChildTest(XBlockAcidParentBase): """ Tests of an AcidBlock with children diff --git a/common/test/acceptance/tests/test_studio_container.py b/common/test/acceptance/tests/test_studio_container.py index a5a480f740..e02ead45e7 100644 --- a/common/test/acceptance/tests/test_studio_container.py +++ b/common/test/acceptance/tests/test_studio_container.py @@ -1,6 +1,7 @@ """ Acceptance tests for Studio related to the container page. """ +from nose.plugins.attrib import attr from ..pages.studio.overview import CourseOutlinePage from ..fixtures.course import XBlockFixtureDesc @@ -9,10 +10,10 @@ from ..pages.studio.component_editor import ComponentEditorView from ..pages.studio.utils import add_discussion from unittest import skip - from acceptance.tests.base_studio_test import StudioCourseTest +@attr('shard_1') class ContainerBase(StudioCourseTest): """ Base class for tests that do operations on the container page. @@ -143,6 +144,7 @@ class NestedVerticalTest(ContainerBase): ) +@attr('shard_1') class DragAndDropTest(NestedVerticalTest): """ Tests of reordering within the container page. @@ -224,6 +226,7 @@ class DragAndDropTest(NestedVerticalTest): self.do_action_and_verify(add_new_components_and_rearrange, expected_ordering) +@attr('shard_1') class AddComponentTest(NestedVerticalTest): """ Tests of adding a component to the container page. @@ -264,6 +267,7 @@ class AddComponentTest(NestedVerticalTest): self.add_and_verify(container_menu, expected_ordering) +@attr('shard_1') class DuplicateComponentTest(NestedVerticalTest): """ Tests of duplicating a component on the container page. @@ -310,6 +314,7 @@ class DuplicateComponentTest(NestedVerticalTest): self.do_action_and_verify(duplicate_twice, expected_ordering) +@attr('shard_1') class DeleteComponentTest(NestedVerticalTest): """ Tests of deleting a component from the container page. @@ -333,6 +338,7 @@ class DeleteComponentTest(NestedVerticalTest): self.delete_and_verify(group_a_item_1_delete_index, expected_ordering) +@attr('shard_1') class EditContainerTest(NestedVerticalTest): """ Tests of editing a container. diff --git a/common/test/acceptance/tests/test_studio_general.py b/common/test/acceptance/tests/test_studio_general.py index f814640f5c..9e72743b7e 100644 --- a/common/test/acceptance/tests/test_studio_general.py +++ b/common/test/acceptance/tests/test_studio_general.py @@ -4,6 +4,7 @@ Acceptance tests for Studio. from unittest import skip from bok_choy.web_app_test import WebAppTest +from nose.plugins.attrib import attr from ..pages.studio.asset_index import AssetIndexPage from ..pages.studio.auto_auth import AutoAuthPage @@ -27,6 +28,7 @@ from ..fixtures.course import XBlockFixtureDesc from acceptance.tests.base_studio_test import StudioCourseTest +@attr('shard_1') class LoggedOutTest(WebAppTest): """ Smoke test for pages in Studio that are visible when logged out. @@ -46,6 +48,7 @@ class LoggedOutTest(WebAppTest): page.visit() +@attr('shard_1') class LoggedInPagesTest(WebAppTest): """ Tests that verify the pages in Studio that you can get to when logged @@ -65,6 +68,7 @@ class LoggedInPagesTest(WebAppTest): self.dashboard_page.visit() +@attr('shard_1') class CoursePagesTest(StudioCourseTest): """ Tests that verify the pages in Studio that you can get to when logged @@ -109,6 +113,7 @@ class CoursePagesTest(StudioCourseTest): page.visit() +@attr('shard_1') class CourseSectionTest(StudioCourseTest): """ Tests that verify the sections name editable only inside headers in Studio Course Outline that you can get to @@ -156,6 +161,7 @@ class CourseSectionTest(StudioCourseTest): self.assertFalse(section_name_edit_form) +@attr('shard_1') class DiscussionPreviewTest(StudioCourseTest): """ Tests that Inline Discussions are rendered with a custom preview in Studio diff --git a/common/test/acceptance/tests/test_studio_split_test.py b/common/test/acceptance/tests/test_studio_split_test.py index b3ae6446b5..3705d0d472 100644 --- a/common/test/acceptance/tests/test_studio_split_test.py +++ b/common/test/acceptance/tests/test_studio_split_test.py @@ -6,6 +6,7 @@ import json import os import math from unittest import skip, skipUnless +from nose.plugins.attrib import attr from xmodule.partitions.partitions import Group, UserPartition from bok_choy.promise import Promise @@ -63,6 +64,7 @@ class SplitTestMixin(object): Promise(missing_groups_button_not_present, "Add missing groups button should not be showing.").fulfill() +@attr('shard_1') class SplitTest(ContainerBase, SplitTestMixin): """ Tests for creating and editing split test instances in Studio. @@ -173,6 +175,7 @@ class SplitTest(ContainerBase, SplitTestMixin): self.verify_groups(container, ['alpha'], [], verify_missing_groups_not_present=False) +@attr('shard_1') @skipUnless(os.environ.get('FEATURE_GROUP_CONFIGURATIONS'), 'Tests Group Configurations feature') class SettingsMenuTest(StudioCourseTest): """ @@ -221,6 +224,7 @@ class SettingsMenuTest(StudioCourseTest): self.assertFalse(self.advanced_settings.q(css=link_css).present) +@attr('shard_1') @skipUnless(os.environ.get('FEATURE_GROUP_CONFIGURATIONS'), 'Tests Group Configurations feature') class GroupConfigurationsTest(ContainerBase, SplitTestMixin): """