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
a0668568
Commit
a0668568
authored
Nov 28, 2015
by
Ben Patterson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10702 from edx/benp/ownlearner-mp-support
OwnLearnerProfile multiprocessing support
parents
4349f931
0071c9d3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
common/test/acceptance/pages/lms/learner_profile.py
+1
-1
common/test/acceptance/tests/helpers.py
+1
-1
common/test/acceptance/tests/lms/test_teams.py
+5
-1
No files found.
common/test/acceptance/pages/lms/learner_profile.py
View file @
a0668568
...
@@ -43,7 +43,7 @@ class LearnerProfilePage(FieldsMixin, PageObject):
...
@@ -43,7 +43,7 @@ class LearnerProfilePage(FieldsMixin, PageObject):
"""
"""
Check if browser is showing correct page.
Check if browser is showing correct page.
"""
"""
return
self
.
q
(
css
=
'body.view-profile'
)
.
present
return
self
.
q
(
css
=
'body.view-profile
.account-settings-container
'
)
.
present
@property
@property
def
privacy
(
self
):
def
privacy
(
self
):
...
...
common/test/acceptance/tests/helpers.py
View file @
a0668568
...
@@ -351,7 +351,7 @@ class EventsTestMixin(TestCase):
...
@@ -351,7 +351,7 @@ class EventsTestMixin(TestCase):
def
setUp
(
self
):
def
setUp
(
self
):
super
(
EventsTestMixin
,
self
)
.
setUp
()
super
(
EventsTestMixin
,
self
)
.
setUp
()
self
.
event_collection
=
MongoClient
()[
"test"
][
"events"
]
self
.
event_collection
=
MongoClient
()[
"test"
][
"events"
]
self
.
reset_event_tracking
()
self
.
start_time
=
datetime
.
now
()
def
reset_event_tracking
(
self
):
def
reset_event_tracking
(
self
):
"""Drop any events that have been collected thus far and start collecting again from scratch."""
"""Drop any events that have been collected thus far and start collecting again from scratch."""
...
...
common/test/acceptance/tests/lms/test_teams.py
View file @
a0668568
...
@@ -1381,7 +1381,11 @@ class EditTeamTest(TeamFormActions):
...
@@ -1381,7 +1381,11 @@ class EditTeamTest(TeamFormActions):
}
}
},
},
]
]
with
self
.
assert_events_match_during
(
event_filter
=
self
.
only_team_events
,
expected_events
=
expected_events
):
with
self
.
assert_events_match_during
(
event_filter
=
self
.
only_team_events
,
expected_events
=
expected_events
,
in_order
=
False
,
):
self
.
team_management_page
.
submit_form
()
self
.
team_management_page
.
submit_form
()
self
.
team_page
.
wait_for_page
()
self
.
team_page
.
wait_for_page
()
...
...
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