From 4c527c370f6169da8e617061b96de2a83bb21da3 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 27 Feb 2017 12:11:18 -0500 Subject: [PATCH 1/3] Fix flakiness on test (it wasn't waiting for jquery to be loaded) --- common/test/acceptance/tests/lms/test_progress_page.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/test/acceptance/tests/lms/test_progress_page.py b/common/test/acceptance/tests/lms/test_progress_page.py index af3fb04b03..84638319da 100644 --- a/common/test/acceptance/tests/lms/test_progress_page.py +++ b/common/test/acceptance/tests/lms/test_progress_page.py @@ -144,6 +144,7 @@ class PersistentGradesTest(ProgressPageBaseTest): subsection = self.course_outline.section(self.SECTION_NAME).subsection(self.SUBSECTION_NAME) subsection.expand_subsection() subsection.add_unit() + self.course_outline.wait_for_ajax() subsection.publish() def _set_staff_lock_on_subsection(self, locked): From a745b2d40199888602072837090161d38d69bdfe Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 27 Feb 2017 12:12:47 -0500 Subject: [PATCH 2/3] Temp commit to ensure flakiness is corrected. --- common/test/acceptance/tests/lms/test_progress_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/test/acceptance/tests/lms/test_progress_page.py b/common/test/acceptance/tests/lms/test_progress_page.py index 84638319da..ede80b3c66 100644 --- a/common/test/acceptance/tests/lms/test_progress_page.py +++ b/common/test/acceptance/tests/lms/test_progress_page.py @@ -228,7 +228,7 @@ class PersistentGradesTest(ProgressPageBaseTest): _change_subsection_structure, _change_weight_for_problem ) - @flaky # TODO: fix this, see TNL-6040 + @flaky(max_runs=20, min_passes=20) # TODO: fix this, see TNL-6040 def test_content_changes_do_not_change_score(self, edit): with self._logged_in_session(): self.courseware_page.visit() From 819706a1c5d9f11ff7bdcd3c21db4ae71ef58ba5 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 27 Feb 2017 14:21:46 -0500 Subject: [PATCH 3/3] Remove flaky decorator. Feel optimistic. --- common/test/acceptance/tests/lms/test_progress_page.py | 1 - 1 file changed, 1 deletion(-) diff --git a/common/test/acceptance/tests/lms/test_progress_page.py b/common/test/acceptance/tests/lms/test_progress_page.py index ede80b3c66..f9f45cc2ee 100644 --- a/common/test/acceptance/tests/lms/test_progress_page.py +++ b/common/test/acceptance/tests/lms/test_progress_page.py @@ -228,7 +228,6 @@ class PersistentGradesTest(ProgressPageBaseTest): _change_subsection_structure, _change_weight_for_problem ) - @flaky(max_runs=20, min_passes=20) # TODO: fix this, see TNL-6040 def test_content_changes_do_not_change_score(self, edit): with self._logged_in_session(): self.courseware_page.visit()