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

unskip acid xblock tests

Browse Source
This commit is contained in:
Christine Lytwynec
2015-06-08 11:53:46 -04:00
parent 94e98e9cae
commit 7e19142b01
2 changed files with 1 additions and 8 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, skip
from unittest import expectedFailure
from ..helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage
@@ -45,7 +45,6 @@ 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
@@ -82,7 +81,6 @@ 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
@@ -130,7 +128,6 @@ 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

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

@@ -1,7 +1,6 @@
"""
Acceptance tests for Studio related to the acid xblock.
"""
from unittest import skip
from bok_choy.web_app_test import WebAppTest
from ...pages.studio.auto_auth import AutoAuthPage
@@ -10,7 +9,6 @@ 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
@@ -117,7 +115,6 @@ 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
@@ -171,7 +168,6 @@ 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