diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index b0ef31309d..8280af04cc 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -5,7 +5,6 @@ End-to-end tests for the LMS. import urllib from datetime import datetime, timedelta from textwrap import dedent -from unittest import skip import pytz from bok_choy.promise import EmptyPromise @@ -436,7 +435,6 @@ class PayAndVerifyTest(EventsTestMixin, UniqueCourseTest): # Add a verified mode to the course ModeCreationPage(self.browser, self.course_id, mode_slug=u'verified', mode_display_name=u'Verified Certificate', min_price=10, suggested_prices='10,20').visit() - @skip("Flaky 02/02/2015") def test_immediate_verification_enrollment(self): # Create a user and log them in student_id = AutoAuthPage(self.browser).visit().get_user_id() diff --git a/common/test/acceptance/tests/studio/test_studio_asset.py b/common/test/acceptance/tests/studio/test_studio_asset.py index 98d7344ede..d7953b63ca 100644 --- a/common/test/acceptance/tests/studio/test_studio_asset.py +++ b/common/test/acceptance/tests/studio/test_studio_asset.py @@ -2,15 +2,12 @@ Acceptance tests for Studio related to the asset index page. """ -from unittest import skip - from common.test.acceptance.fixtures.base import StudioApiLoginError from common.test.acceptance.pages.studio.asset_index import AssetIndexPage from common.test.acceptance.tests.helpers import skip_if_browser from common.test.acceptance.tests.studio.base_studio_test import StudioCourseTest -@skip('FEDX-88') class AssetIndexTest(StudioCourseTest): """ diff --git a/common/test/acceptance/tests/studio/test_studio_container.py b/common/test/acceptance/tests/studio/test_studio_container.py index 409ead8084..d25c323312 100644 --- a/common/test/acceptance/tests/studio/test_studio_container.py +++ b/common/test/acceptance/tests/studio/test_studio_container.py @@ -4,7 +4,6 @@ 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 @@ -73,7 +72,6 @@ class NestedVerticalTest(ContainerBase): ) -@skip("Flaky: 01/16/2015") @attr(shard=1) class DragAndDropTest(NestedVerticalTest): """ @@ -106,53 +104,6 @@ class DragAndDropTest(NestedVerticalTest): {self.group_empty: []}] self.drag_and_verify(self.group_a_item_1_handle, self.group_a_handle, expected_ordering) - def test_drag_into_different_group(self): - """ - Drag Group B Item 1 into Group A (first element). - """ - expected_ordering = [{self.container_title: [self.group_a, self.group_empty, self.group_b]}, - {self.group_a: [self.group_b_item_1, self.group_a_item_1, self.group_a_item_2]}, - {self.group_b: [self.group_b_item_2]}, - {self.group_empty: []}] - self.drag_and_verify(self.group_b_item_1_handle, self.group_a_item_1_handle, expected_ordering) - - def test_drag_group_into_group(self): - """ - Drag Group B into Group A (first element). - """ - expected_ordering = [{self.container_title: [self.group_a, self.group_empty]}, - {self.group_a: [self.group_b, self.group_a_item_1, self.group_a_item_2]}, - {self.group_b: [self.group_b_item_1, self.group_b_item_2]}, - {self.group_empty: []}] - self.drag_and_verify(self.group_b_handle, self.group_a_item_1_handle, expected_ordering) - - def test_drag_after_addition(self): - """ - Add some components and then verify that drag and drop still works. - """ - group_a_menu = 0 - - def add_new_components_and_rearrange(container): - # Add a video component to Group 1 - add_discussion(container, group_a_menu) - # Duplicate the first item in Group A - container.duplicate(self.group_a_item_1_action_index) - - first_handle = self.group_a_item_1_handle - # Drag newly added video component to top. - drag(container, first_handle + 3, first_handle, 40) - # Drag duplicated component to top. - drag(container, first_handle + 2, first_handle, 40) - - duplicate_label = self.duplicate_label.format(self.group_a_item_1) - - expected_ordering = [{self.container_title: [self.group_a, self.group_empty, self.group_b]}, - {self.group_a: [duplicate_label, self.discussion_label, self.group_a_item_1, self.group_a_item_2]}, - {self.group_b: [self.group_b_item_1, self.group_b_item_2]}, - {self.group_empty: []}] - - self.do_action_and_verify(add_new_components_and_rearrange, expected_ordering) - @attr(shard=1) class AddComponentTest(NestedVerticalTest): diff --git a/common/test/acceptance/tests/studio/test_studio_settings_details.py b/common/test/acceptance/tests/studio/test_studio_settings_details.py index e251b172cb..c6682092b9 100644 --- a/common/test/acceptance/tests/studio/test_studio_settings_details.py +++ b/common/test/acceptance/tests/studio/test_studio_settings_details.py @@ -2,7 +2,6 @@ Acceptance tests for Studio's Settings Details pages """ from datetime import datetime, timedelta -from unittest import skip from nose.plugins.attrib import attr @@ -48,7 +47,6 @@ class SettingsMilestonesTest(StudioSettingsDetailsTest): self.assertTrue(self.settings_detail.pre_requisite_course_options) - @skip("Too flaky for the flaky decorator SOL-1811") # SOL-1811 def test_prerequisite_course_save_successfully(self): """ Scenario: Selecting course from Pre-Requisite course drop down save the selected course as pre-requisite @@ -140,7 +138,6 @@ class SettingsMilestonesTest(StudioSettingsDetailsTest): """ self.assertTrue(self.settings_detail.entrance_exam_field) - @skip('Passes in devstack, passes individually in Jenkins, fails in suite in Jenkins.') def test_enable_entrance_exam_for_course(self): """ Test that entrance exam should be created after checking the 'enable entrance exam' checkbox. diff --git a/common/test/acceptance/tests/studio/test_studio_split_test.py b/common/test/acceptance/tests/studio/test_studio_split_test.py index b5427f1e43..f61c1f6f93 100644 --- a/common/test/acceptance/tests/studio/test_studio_split_test.py +++ b/common/test/acceptance/tests/studio/test_studio_split_test.py @@ -3,7 +3,6 @@ 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 @@ -167,24 +166,6 @@ class SplitTest(ContainerBase, SplitTestMixin): container = self.go_to_nested_container_page() self.verify_groups(container, ['Group 0', 'Group 1', 'Group 2'], ['Group ID 0', 'Group ID 1']) - @skip("This fails periodically where it fails to trigger the add missing groups action.Dis") - def test_missing_group(self): - """ - The case of a split test with invalid configuration (missing group). - """ - container = self.create_poorly_configured_split_instance() - - # Wait for the xblock to be fully initialized so that the add button is rendered - wait_for_xblock_initialization(self, '.xblock[data-block-type="split_test"]') - - # Click the add button and verify that the groups were added on the page - container.add_missing_groups() - self.verify_groups(container, ['alpha', 'gamma'], ['beta']) - - # Reload the page to make sure the groups were persisted. - container = self.go_to_nested_container_page() - self.verify_groups(container, ['alpha', 'gamma'], ['beta']) - def test_delete_inactive_group(self): """ Test deleting an inactive group. diff --git a/common/test/acceptance/tests/video/test_video_module.py b/common/test/acceptance/tests/video/test_video_module.py index 6181463a9f..e6a589438e 100644 --- a/common/test/acceptance/tests/video/test_video_module.py +++ b/common/test/acceptance/tests/video/test_video_module.py @@ -4,7 +4,7 @@ Acceptance tests for Video. """ import os -from unittest import skip, skipIf +from unittest import skipIf from ddt import data, ddt, unpack from mock import patch @@ -761,36 +761,6 @@ class YouTubeVideoTest(VideoBaseTest): self.assertGreaterEqual(self.video.seconds, 3) - @skip("Intermittently fails 03 June 2014") - def test_video_position_stored_correctly_with_seek(self): - """ - Scenario: Video component stores position correctly when page is reloaded - Given the course has a Video component in "Youtube" mode - Then the video has rendered in "Youtube" mode - And I click video button "play"" - And I click video button "pause" - Then I seek video to "0:10" position - And I click video button "play"" - And I click video button "pause" - And I reload the page with video - Then video slider should be Equal or Greater than "0:10" - - """ - self.navigate_to_video() - - self.video.click_player_button('play') - - self.video.seek('0:10') - - self.video.click_player_button('pause') - - self.video.reload_page() - - self.video.click_player_button('play') - self.video.click_player_button('pause') - - self.assertGreaterEqual(self.video.seconds, 10) - def test_simplified_and_traditional_chinese_transcripts(self): """ Scenario: Simplified and Traditional Chinese transcripts work as expected in Youtube mode