Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains

cms/djangoapps/contentstore/tests/test_course_listing.py

@@ -93,8 +93,7 @@ class TestCourseListing(ModuleStoreTestCase):
         """
         message = u"Are you staff on an existing {studio_name} course?".format(studio_name=settings.STUDIO_SHORT_NAME)
         response = self.client.get('/home')
-        self.assertEqual(response.status_code, 200)
-        self.assertIn(message, response.content.decode(response.charset))
+        self.assertContains(response, message)
 
     def test_get_course_list(self):
         """

cms/djangoapps/contentstore/tests/test_export_git.py

@@ -65,19 +65,17 @@ class TestExportGit(CourseTestCase):
         if course hasn't set giturl.
         """
         response = self.client.get(self.test_url)
-        self.assertEqual(200, response.status_code)
-        self.assertIn(
+        self.assertContains(
+            response,
             ('giturl must be defined in your '
              'course settings before you can export to git.'),
-            response.content.decode('utf-8')
         )
 
         response = self.client.get('{}?action=push'.format(self.test_url))
-        self.assertEqual(200, response.status_code)
-        self.assertIn(
+        self.assertContains(
+            response,
             ('giturl must be defined in your '
              'course settings before you can export to git.'),
-            response.content.decode('utf-8')
         )
 
     def test_course_export_failures(self):

cms/djangoapps/contentstore/views/tests/test_videos.py

@@ -781,10 +781,11 @@ class VideosHandlerTestCase(VideoUploadTestMixin, CourseTestCase):
         self.assertEqual(response.status_code, 200)
 
         # Verify that course video button is present in the response if videos transcript feature is enabled.
-        self.assertEqual(
-            '<button class="button course-video-settings-button">' in response.content.decode('utf-8'),
-            is_video_transcript_enabled
-        )
+        button_html = '<button class="button course-video-settings-button">'
+        if is_video_transcript_enabled:
+            self.assertContains(response, button_html)
+        else:
+            self.assertNotContains(response, button_html)
 
 
 @ddt.ddt