Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7556 from edx/clytwynec/skip_acid_block_tests

Browse Source 
skip acid block tests [TE-812]
This commit is contained in:
Christine Lytwynec
2015-04-01 13:25:56 -04:00
parent 1f9ead5d46 0370e90611
commit e69e94029d
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/test/acceptance/tests/lms/test_lms_acid_xblock.py
View File

@@ -3,7 +3,7 @@
End-to-end tests for the LMS.
"""
from unittest import expectedFailure
from unittest import expectedFailure, skip
from ..helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage
@@ -45,6 +45,7 @@ class XBlockAcidBase(UniqueCourseTest):
self.assertTrue(acid_block.scope_passed('user_info'))
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidNoChildTest(XBlockAcidBase):
"""
Tests of an AcidBlock with no children
@@ -81,6 +82,7 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
self.validate_acid_block_view(acid_block)
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidChildTest(XBlockAcidBase):
"""
Tests of an AcidBlock with children
@@ -128,6 +130,7 @@ class XBlockAcidChildTest(XBlockAcidBase):
self.validate_acid_block_view(acid_block)
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidAsideTest(XBlockAcidBase):
"""
Tests of an AcidBlock with children

3
common/test/acceptance/tests/studio/test_studio_acid_xblock.py
View File

@@ -10,6 +10,7 @@ from ...pages.xblock.acid import AcidView
from ...fixtures.course import CourseFixture, XBlockFixtureDesc
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidBase(WebAppTest):
"""
Base class for tests that verify that XBlock integration is working correctly
@@ -116,6 +117,7 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
self.user = course_fix.user
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidParentBase(XBlockAcidBase):
"""
Base class for tests that verify that parent XBlock integration is working correctly
@@ -169,6 +171,7 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase):
self.user = course_fix.user
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidChildTest(XBlockAcidParentBase):
"""
Tests of an AcidBlock with children