Commit 7e19142b by Christine Lytwynec

unskip acid xblock tests

parent 94e98e9c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
End-to-end tests for the LMS. End-to-end tests for the LMS.
""" """
from unittest import expectedFailure, skip from unittest import expectedFailure
from ..helpers import UniqueCourseTest from ..helpers import UniqueCourseTest
from ...pages.lms.auto_auth import AutoAuthPage from ...pages.lms.auto_auth import AutoAuthPage
...@@ -45,7 +45,6 @@ class XBlockAcidBase(UniqueCourseTest): ...@@ -45,7 +45,6 @@ class XBlockAcidBase(UniqueCourseTest):
self.assertTrue(acid_block.scope_passed('user_info')) self.assertTrue(acid_block.scope_passed('user_info'))
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidNoChildTest(XBlockAcidBase): class XBlockAcidNoChildTest(XBlockAcidBase):
""" """
Tests of an AcidBlock with no children Tests of an AcidBlock with no children
...@@ -82,7 +81,6 @@ class XBlockAcidNoChildTest(XBlockAcidBase): ...@@ -82,7 +81,6 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
self.validate_acid_block_view(acid_block) self.validate_acid_block_view(acid_block)
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidChildTest(XBlockAcidBase): class XBlockAcidChildTest(XBlockAcidBase):
""" """
Tests of an AcidBlock with children Tests of an AcidBlock with children
...@@ -130,7 +128,6 @@ class XBlockAcidChildTest(XBlockAcidBase): ...@@ -130,7 +128,6 @@ class XBlockAcidChildTest(XBlockAcidBase):
self.validate_acid_block_view(acid_block) self.validate_acid_block_view(acid_block)
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidAsideTest(XBlockAcidBase): class XBlockAcidAsideTest(XBlockAcidBase):
""" """
Tests of an AcidBlock with children Tests of an AcidBlock with children
......
""" """
Acceptance tests for Studio related to the acid xblock. Acceptance tests for Studio related to the acid xblock.
""" """
from unittest import skip
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from ...pages.studio.auto_auth import AutoAuthPage from ...pages.studio.auto_auth import AutoAuthPage
...@@ -10,7 +9,6 @@ from ...pages.xblock.acid import AcidView ...@@ -10,7 +9,6 @@ from ...pages.xblock.acid import AcidView
from ...fixtures.course import CourseFixture, XBlockFixtureDesc from ...fixtures.course import CourseFixture, XBlockFixtureDesc
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidBase(WebAppTest): class XBlockAcidBase(WebAppTest):
""" """
Base class for tests that verify that XBlock integration is working correctly Base class for tests that verify that XBlock integration is working correctly
...@@ -117,7 +115,6 @@ class XBlockAcidNoChildTest(XBlockAcidBase): ...@@ -117,7 +115,6 @@ class XBlockAcidNoChildTest(XBlockAcidBase):
self.user = course_fix.user self.user = course_fix.user
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidParentBase(XBlockAcidBase): class XBlockAcidParentBase(XBlockAcidBase):
""" """
Base class for tests that verify that parent XBlock integration is working correctly Base class for tests that verify that parent XBlock integration is working correctly
...@@ -171,7 +168,6 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase): ...@@ -171,7 +168,6 @@ class XBlockAcidEmptyParentTest(XBlockAcidParentBase):
self.user = course_fix.user self.user = course_fix.user
@skip('Jenkins builds are getting stuck on acid_block tests')
class XBlockAcidChildTest(XBlockAcidParentBase): class XBlockAcidChildTest(XBlockAcidParentBase):
""" """
Tests of an AcidBlock with children Tests of an AcidBlock with children
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment