Merge pull request #144 from edx/fix/msteele/instructor_tests

fix gradebook tests

lms/djangoapps/instructor/tests/test_gradebook.py

@@ -16,6 +16,7 @@ from xmodule.modulestore.django import modulestore
 
 USER_COUNT = 11
 
+
 @override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
 class TestGradebook(ModuleStoreTestCase):
     grading_policy = None
@@ -41,10 +42,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)
@@ -72,10 +70,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(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]
@@ -92,6 +91,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": [