Commit 52b741fe by Jonathan Piacenti

Eliminate username clashes with ModuleStoreTestCase in projects tests.

parent 5f452c7c
...@@ -66,7 +66,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase): ...@@ -66,7 +66,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase):
Test the data migration Test the data migration
""" """
# Set up the data to be migrated # Set up the data to be migrated
user = User.objects.create(email='testuser@edx.org', username='testuser', password='testpassword', is_active=True) user = User.objects.create(email='testuser@edx.org', username='testuser1', password='testpassword', is_active=True)
project = Project.objects.create(course_id=self.old_style_course_id, content_id=self.old_style_content_id) project = Project.objects.create(course_id=self.old_style_course_id, content_id=self.old_style_content_id)
workgroup = Workgroup.objects.create(name='Test Workgroup', project=project) workgroup = Workgroup.objects.create(name='Test Workgroup', project=project)
workgroup_review = WorkgroupReview.objects.create(workgroup=workgroup, content_id=self.old_style_content_id) workgroup_review = WorkgroupReview.objects.create(workgroup=workgroup, content_id=self.old_style_content_id)
......
...@@ -69,7 +69,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase): ...@@ -69,7 +69,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase):
Test the data migration Test the data migration
""" """
# Set up the data to be migrated # Set up the data to be migrated
user = User.objects.create(email='testuser@edx.org', username='testuser', password='testpassword', is_active=True) user = User.objects.create(email='testuser@edx.org', username='testuser1', password='testpassword', is_active=True)
project = Project.objects.create(course_id=self.old_style_course_id, content_id=self.old_style_content_id) project = Project.objects.create(course_id=self.old_style_course_id, content_id=self.old_style_content_id)
workgroup = Workgroup.objects.create(name='Test Workgroup', project=project) workgroup = Workgroup.objects.create(name='Test Workgroup', project=project)
workgroup_review = WorkgroupReview.objects.create(workgroup=workgroup, content_id=self.old_style_content_id) workgroup_review = WorkgroupReview.objects.create(workgroup=workgroup, content_id=self.old_style_content_id)
......
...@@ -42,7 +42,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase): ...@@ -42,7 +42,7 @@ class MigrateCourseIdsTests(ModuleStoreTestCase):
Test the data migration Test the data migration
""" """
# Set up the data to be migrated # Set up the data to be migrated
user = User.objects.create(email='testuser@edx.org', username='testuser', password='testpassword', is_active=True) user = User.objects.create(email='testuser@edx.org', username='testuser1', password='testpassword', is_active=True)
reviewer = User.objects.create(email='testreviewer@edx.org', username='testreviewer', password='testpassword', is_active=True) reviewer = User.objects.create(email='testreviewer@edx.org', username='testreviewer', password='testpassword', is_active=True)
project = Project.objects.create(course_id=self.bad_style_course_id, content_id=self.bad_style_content_id) project = Project.objects.create(course_id=self.bad_style_course_id, content_id=self.bad_style_content_id)
workgroup = Workgroup.objects.create(name='Test Workgroup', project=project) workgroup = Workgroup.objects.create(name='Test Workgroup', project=project)
......
...@@ -41,8 +41,6 @@ class ProjectsReceiversTests(ModuleStoreTestCase): ...@@ -41,8 +41,6 @@ class ProjectsReceiversTests(ModuleStoreTestCase):
display_name="Overview" display_name="Overview"
) )
self.user = User.objects.create(email='testuser@edx.org', username='testuser', password='testpassword', is_active=True)
def test_receiver_on_course_deleted(self): def test_receiver_on_course_deleted(self):
project = models.Project.objects.create( project = models.Project.objects.create(
course_id=unicode(self.course.id), course_id=unicode(self.course.id),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment