Remove more settings, command and test class

Author: humitos

readthedocs/core/management/commands/archive.py

@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
 """Base classes and mixins for unit tests."""
 import logging
-import os
-import shutil
-import tempfile
 from collections import OrderedDict
 
-from django.conf import settings
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.contrib.sessions.middleware import SessionMiddleware
@@ -17,21 +13,6 @@
 log = logging.getLogger(__name__)
 
 
-class RTDTestCase(TestCase):
-    def setUp(self):
-        self.original_DOCROOT = settings.DOCROOT
-        self.cwd = os.path.dirname(__file__)
-        self.build_dir = tempfile.mkdtemp()
-        log.info('build dir: %s', self.build_dir)
-        if not os.path.exists(self.build_dir):
-            os.makedirs(self.build_dir)
-        settings.DOCROOT = self.build_dir
-
-    def tearDown(self):
-        shutil.rmtree(self.build_dir)
-        settings.DOCROOT = self.original_DOCROOT
-
-
 @patch('readthedocs.projects.views.private.trigger_build', lambda x: None)
 @patch('readthedocs.projects.views.private.trigger_build', lambda x: None)
 class MockBuildTestCase(TestCase):

readthedocs/rtd_tests/base.py

@@ -5,6 +5,7 @@
 from tempfile import mkdtemp
 import textwrap
 
+from django.test import TestCase
 import django_dynamic_fixture as fixture
 from django.contrib.auth.models import User
 from mock import Mock, patch
@@ -14,7 +15,6 @@
 from readthedocs.config import ALL
 from readthedocs.projects.exceptions import RepositoryError
 from readthedocs.projects.models import Feature, Project
-from readthedocs.rtd_tests.base import RTDTestCase
 from readthedocs.rtd_tests.utils import (
     create_git_branch,
     create_git_tag,
@@ -25,7 +25,7 @@
 )
 
 
-class TestGitBackend(RTDTestCase):
+class TestGitBackend(TestCase):
     def setUp(self):
         git_repo = make_test_git()
         super().setUp()
@@ -277,7 +277,7 @@ def test_fetch_clean_tags_and_branches(self, checkout_path):
         )
 
 
-class TestHgBackend(RTDTestCase):
+class TestHgBackend(TestCase):
 
     def setUp(self):
         hg_repo = make_test_hg()

readthedocs/rtd_tests/tests/test_backend.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 """Tests For SVN."""
 
+from django.test import TestCase
+
 from django_dynamic_fixture import get
 
 from readthedocs.builds.models import Version
 from readthedocs.projects.models import Project
-from readthedocs.rtd_tests.base import RTDTestCase
 from readthedocs.vcs_support.backends.svn import Backend as SvnBackend
 
 
-class TestSvnBackend(RTDTestCase):
+class TestSvnBackend(TestCase):
 
     def test_get_url(self):
         project = get(Project)

readthedocs/rtd_tests/tests/test_backend_svn.py

@@ -4,6 +4,7 @@
 from tempfile import mkdtemp
 
 from allauth.socialaccount.models import SocialAccount
+from django.test import TestCase
 from django.contrib.auth.models import User
 from django_dynamic_fixture import get
 from messages_extends.models import Message
@@ -22,7 +23,6 @@
 from readthedocs.projects import tasks
 from readthedocs.projects.exceptions import RepositoryError
 from readthedocs.projects.models import Project
-from readthedocs.rtd_tests.base import RTDTestCase
 from readthedocs.rtd_tests.mocks.mock_api import mock_api
 from readthedocs.rtd_tests.utils import (
     create_git_branch,
@@ -32,7 +32,7 @@
 )
 
 
-class TestCeleryBuilding(RTDTestCase):
+class TestCeleryBuilding(TestCase):
 
     """
     These tests run the build functions directly.

readthedocs/rtd_tests/tests/test_celery.py

@@ -87,8 +87,6 @@ class CommunityBaseSettings(Settings):
     DONT_HIT_API = False
     DONT_HIT_DB = True
 
-    SYNC_USER = getpass.getuser()
-
     USER_MATURITY_DAYS = 7
 
     # override classes
@@ -144,7 +142,6 @@ def INSTALLED_APPS(self):  # noqa
             'readthedocs.sphinx_domains',
             'readthedocs.search',
 
-
             # allauth
             'allauth',
             'allauth.account',
@@ -214,9 +211,6 @@ def USE_PROMOS(self):  # noqa
     SITE_ROOT = os.path.dirname(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
     TEMPLATE_ROOT = os.path.join(SITE_ROOT, 'readthedocs', 'templates')
-    DOCROOT = os.path.join(SITE_ROOT, 'user_builds')
-    UPLOAD_ROOT = os.path.join(SITE_ROOT, 'user_uploads')
-    CNAME_ROOT = os.path.join(SITE_ROOT, 'cnames')
     LOGS_ROOT = os.path.join(SITE_ROOT, 'logs')
     PRODUCTION_ROOT = os.path.join(SITE_ROOT, 'prod_artifacts')
     PRODUCTION_MEDIA_ARTIFACTS = os.path.join(PRODUCTION_ROOT, 'media')
@@ -430,7 +424,6 @@ def USE_PROMOS(self):  # noqa
     DEFAULT_PRIVACY_LEVEL = 'public'
     DEFAULT_VERSION_PRIVACY_LEVEL = 'public'
     GROK_API_HOST = 'https://api.grokthedocs.com'
-    SERVE_DOCS = ['public']
     ALLOW_ADMIN = True
 
     # Elasticsearch settings.
@@ -508,7 +501,6 @@ def USE_PROMOS(self):  # noqa
     GRAVATAR_DEFAULT_IMAGE = 'https://assets.readthedocs.org/static/images/silhouette.png'  # NOQA
     OAUTH_AVATAR_USER_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
     OAUTH_AVATAR_ORG_DEFAULT_URL = GRAVATAR_DEFAULT_IMAGE
-    RESTRICTEDSESSIONS_AUTHED_ONLY = True
     RESTRUCTUREDTEXT_FILTER_SETTINGS = {
         'cloak_email_addresses': True,
         'file_insertion_enabled': False,