Merge pull request #18793 from edx/jmbowman/fix_xfail

Fix sudden breakage of expectedFail

common/test/acceptance/tests/lms/test_lms_acid_xblock.py

@@ -3,7 +3,7 @@
 End-to-end tests for the LMS.
 """
 
-from unittest import expectedFailure
+import pytest
 
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
 from common.test.acceptance.pages.common.auto_auth import AutoAuthPage
@@ -120,6 +120,7 @@ class XBlockAcidChildTest(XBlockAcidBase):
         self.validate_acid_block_view(acid_block)
 
 
+@pytest.mark.xfail
 class XBlockAcidAsideTest(XBlockAcidBase):
     """
     Tests of an AcidBlock with children
@@ -144,7 +145,6 @@ class XBlockAcidAsideTest(XBlockAcidBase):
             )
         ).install()
 
-    @expectedFailure
     def test_acid_block(self):
         """
         Verify that all expected acid block tests pass in the lms.