Commit 3b39aa49 by Christina Roberts Committed by GitHub

Merge pull request #15230 from edx/christina/ed-511

Mark test as flaky, and remove flaky from a fixed test.
parents b97af89f c3eaaae5
...@@ -140,7 +140,6 @@ class LoginFromCombinedPageTest(UniqueCourseTest): ...@@ -140,7 +140,6 @@ class LoginFromCombinedPageTest(UniqueCourseTest):
self.login_page.visit().toggle_form() self.login_page.visit().toggle_form()
self.assertEqual(self.login_page.current_form, "register") self.assertEqual(self.login_page.current_form, "register")
@flaky # ECOM-1165
def test_password_reset_success(self): def test_password_reset_success(self):
# Create a user account # Create a user account
email, password = self._create_unique_user() # pylint: disable=unused-variable email, password = self._create_unique_user() # pylint: disable=unused-variable
...@@ -565,6 +564,7 @@ class CourseWikiTest(UniqueCourseTest): ...@@ -565,6 +564,7 @@ class CourseWikiTest(UniqueCourseTest):
self.course_wiki_edit_page.wait_for_page() self.course_wiki_edit_page.wait_for_page()
@attr(shard=1) @attr(shard=1)
@flaky # EDUCATOR-511
def test_edit_course_wiki(self): def test_edit_course_wiki(self):
""" """
Wiki page by default is editable for students. Wiki page by default is editable for students.
......
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