Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
628e4cfe
Commit
628e4cfe
authored
Sep 30, 2016
by
J. Cliff Dyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Flaky test decorators. Tickets exist:"
This reverts commit
988bfa04
.
parent
aaa37d67
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
22 deletions
+7
-22
common/test/acceptance/tests/lms/test_account_settings.py
+5
-12
common/test/acceptance/tests/lms/test_lms_courseware.py
+0
-2
common/test/acceptance/tests/lms/test_lms_matlab_problem.py
+2
-5
common/test/acceptance/tests/studio/test_studio_course_info.py
+0
-3
No files found.
common/test/acceptance/tests/lms/test_account_settings.py
View file @
628e4cfe
...
...
@@ -2,18 +2,18 @@
"""
End-to-end tests for the Account Settings page.
"""
from
datetime
import
datetime
from
unittest
import
skip
from
nose.plugins.attrib
import
attr
from
bok_choy.web_app_test
import
WebAppTest
from
bok_choy.page_object
import
XSS_INJECTION
from
flaky
import
flaky
from
nose.plugins.attrib
import
attr
from
datetime
import
datetime
from
pytz
import
timezone
,
utc
from
common.test.acceptance.pages.lms.account_settings
import
AccountSettingsPage
from
common.test.acceptance.pages.lms.auto_auth
import
AutoAuthPage
from
common.test.acceptance.pages.lms.dashboard
import
DashboardPage
from
common.test.acceptance.tests.helpers
import
EventsTestMixin
...
...
@@ -216,14 +216,8 @@ class AccountSettingsPageTest(AccountSettingsTestMixin, WebAppTest):
self
.
assertEqual
(
self
.
account_settings_page
.
value_for_text_field
(
field_id
),
new_value
)
def
_test_dropdown_field
(
self
,
field_id
,
title
,
initial_value
,
new_values
,
success_message
=
SUCCESS_MESSAGE
,
# pylint: disable=unused-argument
reloads_on_save
=
False
):
self
,
field_id
,
title
,
initial_value
,
new_values
,
success_message
=
SUCCESS_MESSAGE
,
reloads_on_save
=
False
):
"""
Test behaviour of a dropdown field.
"""
...
...
@@ -256,7 +250,6 @@ class AccountSettingsPageTest(AccountSettingsTestMixin, WebAppTest):
"""
self
.
_test_readonly_field
(
'username'
,
'Username'
,
self
.
username
)
@flaky
def
test_full_name_field
(
self
):
"""
Test behaviour of "Full Name" field.
...
...
common/test/acceptance/tests/lms/test_lms_courseware.py
View file @
628e4cfe
...
...
@@ -7,7 +7,6 @@ import json
from
datetime
import
datetime
,
timedelta
import
ddt
from
flaky
import
flaky
from
nose.plugins.attrib
import
attr
from
..helpers
import
UniqueCourseTest
,
EventsTestMixin
,
auto_auth
,
create_multiple_choice_problem
...
...
@@ -263,7 +262,6 @@ class ProctoredExamTest(UniqueCourseTest):
LogoutPage
(
self
.
browser
)
.
visit
()
@flaky
@ddt.data
(
True
,
False
)
def
test_timed_exam_flow
(
self
,
hide_after_due
):
"""
...
...
common/test/acceptance/tests/lms/test_lms_matlab_problem.py
View file @
628e4cfe
...
...
@@ -2,15 +2,13 @@
"""
Test for matlab problems
"""
from
textwrap
import
dedent
import
time
from
flaky
import
flaky
from
common.test.acceptance.pages.lms.matlab_problem
import
MatlabProblemPage
from
common.test.acceptance.fixtures.course
import
XBlockFixtureDesc
from
common.test.acceptance.fixtures.xqueue
import
XQueueResponseFixture
from
common.test.acceptance.tests.lms.test_lms_problems
import
ProblemsTest
from
textwrap
import
dedent
class
MatlabProblemTest
(
ProblemsTest
):
...
...
@@ -61,14 +59,13 @@ class MatlabProblemTest(ProblemsTest):
self
.
assertEqual
(
matlab_problem_page
.
problem_name
,
'Test Matlab Problem'
)
return
matlab_problem_page
@flaky
def
test_run_code
(
self
):
"""
Test "Run Code" button functionality.
"""
# Enter a submission, which will trigger a pre-defined response from the XQueue stub.
self
.
submission
=
"a=1"
+
self
.
unique_id
[
0
:
5
]
# pylint: disable=attribute-defined-outside-init
self
.
submission
=
"a=1"
+
self
.
unique_id
[
0
:
5
]
self
.
xqueue_grade_response
=
{
'msg'
:
self
.
submission
}
...
...
common/test/acceptance/tests/studio/test_studio_course_info.py
View file @
628e4cfe
"""
Acceptance Tests for Course Information
"""
from
flaky
import
flaky
from
common.test.acceptance.pages.studio.course_info
import
CourseUpdatesPage
from
common.test.acceptance.tests.studio.base_studio_test
import
StudioCourseTest
...
...
@@ -79,7 +77,6 @@ class UsersCanAddUpdatesTest(StudioCourseTest):
self
.
assertFalse
(
self
.
course_updates_page
.
is_first_update_message
(
'Hello'
))
self
.
assertTrue
(
self
.
course_updates_page
.
is_first_update_message
(
'Goodbye'
))
@flaky
def
test_delete_course_update
(
self
):
"""
Scenario: Users can delete updates
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment