From 58a2dc2466c9e190ba1733784eca6b2045768ff0 Mon Sep 17 00:00:00 2001 From: Tasawer Date: Tue, 25 Aug 2015 16:52:29 +0500 Subject: [PATCH] Removing flaky decorator from test ECOM-1165 --- common/test/acceptance/pages/lms/login_and_register.py | 2 +- common/test/acceptance/tests/lms/test_lms.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/test/acceptance/pages/lms/login_and_register.py b/common/test/acceptance/pages/lms/login_and_register.py index bc9efe67ec..2794b3584a 100644 --- a/common/test/acceptance/pages/lms/login_and_register.py +++ b/common/test/acceptance/pages/lms/login_and_register.py @@ -127,7 +127,7 @@ class CombinedLoginAndRegisterPage(PageObject): @property def url(self): """Return the URL for the combined login/registration page. """ - url = "{base}/account/{login_or_register}".format( + url = "{base}/{login_or_register}".format( base=BASE_URL, login_or_register=self._start_page ) diff --git a/common/test/acceptance/tests/lms/test_lms.py b/common/test/acceptance/tests/lms/test_lms.py index ca0a6a260e..bdb5e84b8f 100644 --- a/common/test/acceptance/tests/lms/test_lms.py +++ b/common/test/acceptance/tests/lms/test_lms.py @@ -109,7 +109,6 @@ class LoginFromCombinedPageTest(UniqueCourseTest): self.login_page.visit().toggle_form() self.assertEqual(self.login_page.current_form, "register") - @flaky # TODO fix this, see ECOM-1165 def test_password_reset_success(self): # Create a user account email, password = self._create_unique_user() # pylint: disable=unused-variable