From f9c1c0b38b1ef6b77486a883be76b5570603b06d Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 4 Feb 2014 15:55:32 -0500
Subject: [PATCH 1/4] Move tests related to views files into views/tests.

---
 cms/djangoapps/contentstore/{ => views}/tests/test_access.py   | 0
 cms/djangoapps/contentstore/{ => views}/tests/test_assets.py   | 2 +-
 .../contentstore/{ => views}/tests/test_checklists.py          | 2 +-
 .../contentstore/{ => views}/tests/test_course_index.py        | 0
 .../contentstore/{ => views}/tests/test_course_updates.py      | 0
 .../contentstore/{ => views}/tests/test_import_export.py       | 2 +-
 cms/djangoapps/contentstore/{ => views}/tests/test_item.py     | 0
 cms/djangoapps/contentstore/{ => views}/tests/test_tabs.py     | 0
 .../contentstore/{ => views}/tests/test_textbooks.py           | 3 +--
 .../contentstore/{ => views}/tests/test_transcripts.py         | 0
 .../{tests/test_users.py => views/tests/test_user.py}          | 2 +-
 11 files changed, 5 insertions(+), 6 deletions(-)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_access.py (100%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_assets.py (99%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_checklists.py (99%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_course_index.py (100%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_course_updates.py (100%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_import_export.py (99%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_item.py (100%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_tabs.py (100%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_textbooks.py (99%)
 rename cms/djangoapps/contentstore/{ => views}/tests/test_transcripts.py (100%)
 rename cms/djangoapps/contentstore/{tests/test_users.py => views/tests/test_user.py} (99%)

diff --git a/cms/djangoapps/contentstore/tests/test_access.py b/cms/djangoapps/contentstore/views/tests/test_access.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_access.py
rename to cms/djangoapps/contentstore/views/tests/test_access.py
diff --git a/cms/djangoapps/contentstore/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
similarity index 99%
rename from cms/djangoapps/contentstore/tests/test_assets.py
rename to cms/djangoapps/contentstore/views/tests/test_assets.py
index f5a204504d58..71e8d2e79eb7 100644
--- a/cms/djangoapps/contentstore/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -10,7 +10,7 @@
 from io import BytesIO
 from pytz import UTC
 import json
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 from contentstore.views import assets
 from xmodule.contentstore.content import StaticContent
 from xmodule.modulestore import Location
diff --git a/cms/djangoapps/contentstore/tests/test_checklists.py b/cms/djangoapps/contentstore/views/tests/test_checklists.py
similarity index 99%
rename from cms/djangoapps/contentstore/tests/test_checklists.py
rename to cms/djangoapps/contentstore/views/tests/test_checklists.py
index 90dd40a8b7bf..327254564d3c 100644
--- a/cms/djangoapps/contentstore/tests/test_checklists.py
+++ b/cms/djangoapps/contentstore/views/tests/test_checklists.py
@@ -6,7 +6,7 @@
 from xmodule.modulestore.django import loc_mapper
 
 import json
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 
 
 class ChecklistTestCase(CourseTestCase):
diff --git a/cms/djangoapps/contentstore/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_course_index.py
rename to cms/djangoapps/contentstore/views/tests/test_course_index.py
diff --git a/cms/djangoapps/contentstore/tests/test_course_updates.py b/cms/djangoapps/contentstore/views/tests/test_course_updates.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_course_updates.py
rename to cms/djangoapps/contentstore/views/tests/test_course_updates.py
diff --git a/cms/djangoapps/contentstore/tests/test_import_export.py b/cms/djangoapps/contentstore/views/tests/test_import_export.py
similarity index 99%
rename from cms/djangoapps/contentstore/tests/test_import_export.py
rename to cms/djangoapps/contentstore/views/tests/test_import_export.py
index 85df894cd414..74e1cbd691d3 100644
--- a/cms/djangoapps/contentstore/tests/test_import_export.py
+++ b/cms/djangoapps/contentstore/views/tests/test_import_export.py
@@ -12,7 +12,7 @@
 from uuid import uuid4
 from pymongo import MongoClient
 
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 from django.test.utils import override_settings
 from django.conf import settings
 from xmodule.modulestore.django import loc_mapper
diff --git a/cms/djangoapps/contentstore/tests/test_item.py b/cms/djangoapps/contentstore/views/tests/test_item.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_item.py
rename to cms/djangoapps/contentstore/views/tests/test_item.py
diff --git a/cms/djangoapps/contentstore/tests/test_tabs.py b/cms/djangoapps/contentstore/views/tests/test_tabs.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_tabs.py
rename to cms/djangoapps/contentstore/views/tests/test_tabs.py
diff --git a/cms/djangoapps/contentstore/tests/test_textbooks.py b/cms/djangoapps/contentstore/views/tests/test_textbooks.py
similarity index 99%
rename from cms/djangoapps/contentstore/tests/test_textbooks.py
rename to cms/djangoapps/contentstore/views/tests/test_textbooks.py
index 7296ab851a07..89ace34a7f0d 100644
--- a/cms/djangoapps/contentstore/tests/test_textbooks.py
+++ b/cms/djangoapps/contentstore/views/tests/test_textbooks.py
@@ -1,7 +1,6 @@
 import json
 from unittest import TestCase
-from .utils import CourseTestCase
-from django.core.urlresolvers import reverse
+from contentstore.tests.utils import CourseTestCase
 from contentstore.utils import get_modulestore
 from xmodule.modulestore.inheritance import own_metadata
 
diff --git a/cms/djangoapps/contentstore/tests/test_transcripts.py b/cms/djangoapps/contentstore/views/tests/test_transcripts.py
similarity index 100%
rename from cms/djangoapps/contentstore/tests/test_transcripts.py
rename to cms/djangoapps/contentstore/views/tests/test_transcripts.py
diff --git a/cms/djangoapps/contentstore/tests/test_users.py b/cms/djangoapps/contentstore/views/tests/test_user.py
similarity index 99%
rename from cms/djangoapps/contentstore/tests/test_users.py
rename to cms/djangoapps/contentstore/views/tests/test_user.py
index 27b87fe19193..8c48b0e8bff2 100644
--- a/cms/djangoapps/contentstore/tests/test_users.py
+++ b/cms/djangoapps/contentstore/views/tests/test_user.py
@@ -2,7 +2,7 @@
 Tests for contentstore/views/user.py.
 """
 import json
-from .utils import CourseTestCase
+from contentstore.tests.utils import CourseTestCase
 from django.contrib.auth.models import User, Group
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import loc_mapper

From 5dfe9d705231e50a0ca8dd9c69cbedc1c171286c Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 4 Feb 2014 16:33:44 -0500
Subject: [PATCH 2/4] Remove unused methods.

---
 .../views/tests/test_transcripts.py           | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/tests/test_transcripts.py b/cms/djangoapps/contentstore/views/tests/test_transcripts.py
index 138b60b51322..f92e8e7f216f 100644
--- a/cms/djangoapps/contentstore/views/tests/test_transcripts.py
+++ b/cms/djangoapps/contentstore/views/tests/test_transcripts.py
@@ -333,17 +333,6 @@ def save_subs_to_store(self, subs, subs_id):
         del_cached_content(content_location)
         return content_location
 
-    def remove_subs_from_store(self, subs_id):
-        """Remove from store, if transcripts content exists."""
-        filename = 'subs_{0}.srt.sjson'.format(subs_id)
-        content_location = StaticContent.compute_location(
-            self.org, self.number, filename)
-        try:
-            content = contentstore().find(content_location)
-            contentstore().delete(content.get_id())
-        except NotFoundError:
-            pass
-
     def test_success_download_youtube(self):
         self.item.data = '<video youtube="1:JMD_ifUUfsU" />'
         modulestore().update_item(self.item, self.user.id)
@@ -521,17 +510,6 @@ def save_subs_to_store(self, subs, subs_id):
         del_cached_content(content_location)
         return content_location
 
-    def remove_subs_from_store(self, subs_id):
-        """Remove from store, if transcripts content exists."""
-        filename = 'subs_{0}.srt.sjson'.format(subs_id)
-        content_location = StaticContent.compute_location(
-            self.org, self.number, filename)
-        try:
-            content = contentstore().find(content_location)
-            contentstore().delete(content.get_id())
-        except NotFoundError:
-            pass
-
     def test_success_download_nonyoutube(self):
         subs_id = str(uuid4())
         self.item.data = textwrap.dedent("""

From c2aa0bf62982bdf0408febeff3ef12ed93c9cdcd Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Tue, 4 Feb 2014 16:37:39 -0500
Subject: [PATCH 3/4] pep8 cleanup

---
 cms/djangoapps/contentstore/views/tests/test_access.py         | 1 +
 cms/djangoapps/contentstore/views/tests/test_assets.py         | 1 +
 cms/djangoapps/contentstore/views/tests/test_checklists.py     | 1 -
 cms/djangoapps/contentstore/views/tests/test_course_index.py   | 2 +-
 cms/djangoapps/contentstore/views/tests/test_course_updates.py | 1 -
 cms/djangoapps/contentstore/views/tests/test_import_export.py  | 3 ++-
 cms/djangoapps/contentstore/views/tests/test_user.py           | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/tests/test_access.py b/cms/djangoapps/contentstore/views/tests/test_access.py
index 1fbdbdf84851..d0918195f843 100644
--- a/cms/djangoapps/contentstore/views/tests/test_access.py
+++ b/cms/djangoapps/contentstore/views/tests/test_access.py
@@ -11,6 +11,7 @@
 from student.auth import add_users
 from contentstore.views.access import get_user_role
 
+
 class RolesTest(TestCase):
     """
     Tests for user roles.
diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
index 71e8d2e79eb7..b4af6f9fb46b 100644
--- a/cms/djangoapps/contentstore/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -114,6 +114,7 @@ def assert_correct_sort_response(self, url, sort, direction):
             self.assertGreaterEqual(name1, name2)
             self.assertGreaterEqual(name2, name3)
 
+
 class UploadTestCase(AssetsTestCase):
     """
     Unit tests for uploading a file
diff --git a/cms/djangoapps/contentstore/views/tests/test_checklists.py b/cms/djangoapps/contentstore/views/tests/test_checklists.py
index 327254564d3c..33bfe5e48d7c 100644
--- a/cms/djangoapps/contentstore/views/tests/test_checklists.py
+++ b/cms/djangoapps/contentstore/views/tests/test_checklists.py
@@ -113,7 +113,6 @@ def test_update_checklists_index(self):
         self.assertEqual('CourseOutline', get_first_item(persisted_checklist).get('action_url'))
         self.compare_checklists(persisted_checklist, returned_checklist)
 
-
     def test_update_checklists_delete_unsupported(self):
         """ Delete operation is not supported. """
         update_url = self.location.url_reverse('checklists/', '100')
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_index.py b/cms/djangoapps/contentstore/views/tests/test_course_index.py
index 496b9b70569f..4ca23ee43b64 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_index.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_index.py
@@ -9,6 +9,7 @@
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from xmodule.modulestore import parsers
 
+
 class TestCourseIndex(CourseTestCase):
     """
     Unit tests for getting the list of courses and the course outline.
@@ -25,7 +26,6 @@ def setUp(self):
             display_name='dotted.course.name-2',
         )
 
-
     def check_index_and_outline(self, authed_client):
         """
         Test getting the list of courses and then pulling up their outlines
diff --git a/cms/djangoapps/contentstore/views/tests/test_course_updates.py b/cms/djangoapps/contentstore/views/tests/test_course_updates.py
index 38b24d9f53e7..bc3075668ac8 100644
--- a/cms/djangoapps/contentstore/views/tests/test_course_updates.py
+++ b/cms/djangoapps/contentstore/views/tests/test_course_updates.py
@@ -53,7 +53,6 @@ def get_response(content, date):
             content, json.loads(refetched.content)['content'], "get w/ provided id"
         )
 
-
         # now put in an evil update
         content = '<ol/>'
         payload = get_response(content, 'January 11, 2013')
diff --git a/cms/djangoapps/contentstore/views/tests/test_import_export.py b/cms/djangoapps/contentstore/views/tests/test_import_export.py
index 74e1cbd691d3..e01e6ba565a1 100644
--- a/cms/djangoapps/contentstore/views/tests/test_import_export.py
+++ b/cms/djangoapps/contentstore/views/tests/test_import_export.py
@@ -25,6 +25,7 @@
 
 log = logging.getLogger(__name__)
 
+
 @override_settings(CONTENTSTORE=TEST_DATA_CONTENTSTORE)
 class ImportTestCase(CourseTestCase):
     """
@@ -178,7 +179,7 @@ def test_unsafe_tar(self):
 
         def try_tar(tarpath):
             with open(tarpath) as tar:
-                args = { "name": tarpath, "course-data": [tar] }
+                args = {"name": tarpath, "course-data": [tar]}
                 resp = self.client.post(self.url, args)
             self.assertEquals(resp.status_code, 400)
             self.assertTrue("SuspiciousFileOperation" in resp.content)
diff --git a/cms/djangoapps/contentstore/views/tests/test_user.py b/cms/djangoapps/contentstore/views/tests/test_user.py
index 8c48b0e8bff2..db44b4fa97f9 100644
--- a/cms/djangoapps/contentstore/views/tests/test_user.py
+++ b/cms/djangoapps/contentstore/views/tests/test_user.py
@@ -3,7 +3,7 @@
 """
 import json
 from contentstore.tests.utils import CourseTestCase
-from django.contrib.auth.models import User, Group
+from django.contrib.auth.models import User
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import loc_mapper
 from student.roles import CourseStaffRole, CourseInstructorRole

From fc1e8fae2eecc4b60a8bfe568ad8f5f4672eb3dc Mon Sep 17 00:00:00 2001
From: cahrens <christina@edx.org>
Date: Mon, 10 Feb 2014 16:08:59 -0500
Subject: [PATCH 4/4] Remove unused imports.

---
 cms/djangoapps/contentstore/transcripts_utils.py           | 1 -
 cms/djangoapps/contentstore/views/checklist.py             | 3 ---
 cms/djangoapps/contentstore/views/course.py                | 1 -
 cms/djangoapps/contentstore/views/tabs.py                  | 2 --
 cms/djangoapps/contentstore/views/tests/test_checklists.py | 1 -
 cms/djangoapps/contentstore/views/tests/test_textbooks.py  | 1 -
 6 files changed, 9 deletions(-)

diff --git a/cms/djangoapps/contentstore/transcripts_utils.py b/cms/djangoapps/contentstore/transcripts_utils.py
index 48c7d3d690f2..68f1b29d0db8 100644
--- a/cms/djangoapps/contentstore/transcripts_utils.py
+++ b/cms/djangoapps/contentstore/transcripts_utils.py
@@ -17,7 +17,6 @@
 from xmodule.contentstore.content import StaticContent
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore import Location
-from xmodule.modulestore.inheritance import own_metadata
 
 from .utils import get_modulestore
 
diff --git a/cms/djangoapps/contentstore/views/checklist.py b/cms/djangoapps/contentstore/views/checklist.py
index aafecc2b0e58..352ead8cce20 100644
--- a/cms/djangoapps/contentstore/views/checklist.py
+++ b/cms/djangoapps/contentstore/views/checklist.py
@@ -11,9 +11,6 @@
 from django.core.exceptions import PermissionDenied
 from xmodule.modulestore.django import loc_mapper
 
-from xmodule.modulestore.inheritance import own_metadata
-
-
 from ..utils import get_modulestore
 from .access import has_course_access
 from xmodule.course_module import CourseDescriptor
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index e539edf999c0..782ea03c3b0f 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -20,7 +20,6 @@
 
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore.django import modulestore, loc_mapper
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.contentstore.content import StaticContent
 
 from xmodule.modulestore.exceptions import (
diff --git a/cms/djangoapps/contentstore/views/tabs.py b/cms/djangoapps/contentstore/views/tabs.py
index f3291ae92818..aa479e2e351d 100644
--- a/cms/djangoapps/contentstore/views/tabs.py
+++ b/cms/djangoapps/contentstore/views/tabs.py
@@ -10,8 +10,6 @@
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_http_methods
 from edxmako.shortcuts import render_to_response
-from xmodule.modulestore import Location
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.django import loc_mapper
 from xmodule.modulestore.locator import BlockUsageLocator
diff --git a/cms/djangoapps/contentstore/views/tests/test_checklists.py b/cms/djangoapps/contentstore/views/tests/test_checklists.py
index 33bfe5e48d7c..aa480a525ced 100644
--- a/cms/djangoapps/contentstore/views/tests/test_checklists.py
+++ b/cms/djangoapps/contentstore/views/tests/test_checklists.py
@@ -1,7 +1,6 @@
 """ Unit tests for checklist methods in views.py. """
 from contentstore.utils import get_modulestore
 from contentstore.views.checklist import expand_checklist_action_url
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.django import loc_mapper
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_textbooks.py b/cms/djangoapps/contentstore/views/tests/test_textbooks.py
index 89ace34a7f0d..7312d0c70ac8 100644
--- a/cms/djangoapps/contentstore/views/tests/test_textbooks.py
+++ b/cms/djangoapps/contentstore/views/tests/test_textbooks.py
@@ -2,7 +2,6 @@
 from unittest import TestCase
 from contentstore.tests.utils import CourseTestCase
 from contentstore.utils import get_modulestore
-from xmodule.modulestore.inheritance import own_metadata
 
 from contentstore.views.course import (
     validate_textbooks_json, validate_textbook_json, TextbookValidationError)