Merge pull request #14172 from edx/bjacobel/TNL-5770

TNL-5770 (non-)flaky test

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

@@ -2,8 +2,6 @@
 Bok choy acceptance tests for conditionals in the LMS
 """
 
-from flaky import flaky
-
 from capa.tests.response_xml_factory import StringResponseXMLFactory
 from common.test.acceptance.tests.helpers import UniqueCourseTest
 from common.test.acceptance.fixtures.course import CourseFixture, XBlockFixtureDesc
@@ -115,7 +113,6 @@ class ConditionalTest(UniqueCourseTest):
         conditional_page = ConditionalPage(self.browser)
         self.assertTrue(conditional_page.is_content_visible())
 
-    @flaky  # TNL-5770
     def test_conditional_handles_polls(self):
         self.install_course_fixture(block_type='poll')
         self.courseware_page.visit()