From 392953661244fcf72137fe59139246dcfa150513 Mon Sep 17 00:00:00 2001 From: Jeremy Bowman Date: Wed, 15 Aug 2018 21:57:25 -0400 Subject: [PATCH] Fix sudden breakage of expectedFail --- common/test/acceptance/tests/lms/test_lms_acid_xblock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/test/acceptance/tests/lms/test_lms_acid_xblock.py b/common/test/acceptance/tests/lms/test_lms_acid_xblock.py index 7972f54764..6f45d5f61f 100644 --- a/common/test/acceptance/tests/lms/test_lms_acid_xblock.py +++ b/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.