Merge pull request #10702 from edx/benp/ownlearner-mp-support

OwnLearnerProfile multiprocessing support
This commit is contained in:
Ben Patterson
2015-11-28 14:27:05 -05:00
3 changed files with 7 additions and 3 deletions

View File

@@ -43,7 +43,7 @@ class LearnerProfilePage(FieldsMixin, PageObject):
"""
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
def privacy(self):

View File

@@ -351,7 +351,7 @@ class EventsTestMixin(TestCase):
def setUp(self):
super(EventsTestMixin, self).setUp()
self.event_collection = MongoClient()["test"]["events"]
self.reset_event_tracking()
self.start_time = datetime.now()
def reset_event_tracking(self):
"""Drop any events that have been collected thus far and start collecting again from scratch."""

View File

@@ -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_page.wait_for_page()