From 0825319cc7c81f675d0304e49f0654c9a249eaef Mon Sep 17 00:00:00 2001 From: Miles Steele Date: Wed, 12 Jun 2013 11:49:35 -0400 Subject: [PATCH 1/2] fix gradebook tests --- lms/djangoapps/instructor/tests/test_gradebook.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/instructor/tests/test_gradebook.py b/lms/djangoapps/instructor/tests/test_gradebook.py index 4b1d22b594..49a3d23e39 100644 --- a/lms/djangoapps/instructor/tests/test_gradebook.py +++ b/lms/djangoapps/instructor/tests/test_gradebook.py @@ -18,6 +18,7 @@ from xmodule.modulestore.django import modulestore USER_COUNT = 11 + @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE) class TestGradebook(ModuleStoreTestCase): grading_policy = None @@ -43,10 +44,7 @@ class TestGradebook(ModuleStoreTestCase): metadata={'graded': True, 'format': 'Homework'} ) - self.users = [ - UserFactory.create(username='robot%d' % i, email='robot+test+%d@edx.org' % i) - for i in xrange(USER_COUNT) - ] + self.users = [UserFactory() for _ in xrange(USER_COUNT)] for user in self.users: CourseEnrollmentFactory.create(user=user, course_id=self.course.id) @@ -74,10 +72,11 @@ class TestGradebook(ModuleStoreTestCase): def test_response_code(self): self.assertEquals(self.response.status_code, 200) + class TestDefaultGradingPolicy(TestGradebook): def test_all_users_listed(self): for user in self.users: - self.assertIn(user.username, self.response.content) + self.assertIn(str(user.username), str(self.response.content)) def test_default_policy(self): # Default >= 50% passes, so Users 5-10 should be passing for Homework 1 [6] @@ -94,6 +93,7 @@ class TestDefaultGradingPolicy(TestGradebook): # One use at the top of the page [1] self.assertEquals(293, self.response.content.count('grade_None')) + class TestLetterCutoffPolicy(TestGradebook): grading_policy = { "GRADER": [ From 7fb9bfd685067d51b5131efe1118c31f6b4d7016 Mon Sep 17 00:00:00 2001 From: Miles Steele Date: Thu, 13 Jun 2013 10:25:36 -0400 Subject: [PATCH 2/2] fix test string comparison --- lms/djangoapps/instructor/tests/test_gradebook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/instructor/tests/test_gradebook.py b/lms/djangoapps/instructor/tests/test_gradebook.py index 49a3d23e39..f0633f90c0 100644 --- a/lms/djangoapps/instructor/tests/test_gradebook.py +++ b/lms/djangoapps/instructor/tests/test_gradebook.py @@ -76,7 +76,7 @@ class TestGradebook(ModuleStoreTestCase): class TestDefaultGradingPolicy(TestGradebook): def test_all_users_listed(self): for user in self.users: - self.assertIn(str(user.username), str(self.response.content)) + self.assertIn(user.username, unicode(self.response.content, 'utf-8')) def test_default_policy(self): # Default >= 50% passes, so Users 5-10 should be passing for Homework 1 [6]