Merge pull request #10700 from edx/benp/cohort-mp-fixes

Make cohort management tests multiprocess capable.

common/test/acceptance/tests/lms/test_learner_profile.py

@@ -604,7 +604,7 @@ class OwnLearnerProfilePageTest(LearnerProfileTestMixin, WebAppTest):
 
         self.assert_default_image_has_public_access(profile_page)
 
-        profile_page.upload_file(filename='cohort_users_only_username.csv')
+        profile_page.upload_file(filename='generic_csv.csv')
         self.assertEqual(
             profile_page.profile_image_message,
             "The file must be one of the following types: .gif, .png, .jpeg, .jpg."

common/test/data/uploads/cohort_users_both_columns.csv

-username,email,ignored_column,cohort
-instructor_user,,June,ManualCohort1
-,student_user@example.com,Spring,AutoCohort1
-other_student_user,,Fall,ManualCohort1

common/test/data/uploads/cohort_users_only_email.csv

-email,cohort
-instructor_user@example.com,ManualCohort1
-student_user@example.com,AutoCohort1
-other_student_user@example.com,ManualCohort1
-

common/test/data/uploads/cohort_users_only_username.csv

-username,cohort
-instructor_user,ManualCohort1
-student_user,AutoCohort1
-other_student_user,ManualCohort1

common/test/data/uploads/generic_csv.csv

+column_1,column_2
+foo,bar
+foo,baz
+hello,there
+file_size,must_be_100_bytes
+the story,was
+very very very very very,interesting