Merge pull request #692 from toffer/rtd-tests-housekeeping

rtd_tests housekeeping

Author: ericholscher

readthedocs/rtd_tests/tests/base.py renamed to readthedocs/rtd_tests/base.py

@@ -3,7 +3,7 @@
 from django.contrib.admin.models import User
 
 from projects.models import Project
-from rtd_tests.tests.base import RTDTestCase
+from rtd_tests.base import RTDTestCase
 
 from rtd_tests.utils import make_test_git, make_test_hg
 

readthedocs/rtd_tests/tests/files/api.fjson renamed to readthedocs/rtd_tests/files/api.fjson

@@ -8,8 +8,8 @@
 from projects import tasks
 
 from rtd_tests.utils import make_test_git
-from rtd_tests.tests.base import RTDTestCase
-from rtd_tests.tests.mock_api import MockApi
+from rtd_tests.base import RTDTestCase
+from rtd_tests.mocks.mock_api import MockApi
 
 
 class TestCeleryBuilding(RTDTestCase):

readthedocs/rtd_tests/mocks/__init__.py

@@ -5,7 +5,7 @@
 from projects.models import Project
 
 from rtd_tests.utils import make_test_git
-from rtd_tests.tests.base import RTDTestCase
+from rtd_tests.base import RTDTestCase
 
 
 class TestBuilding(RTDTestCase):

readthedocs/rtd_tests/tests/mock_api.py renamed to readthedocs/rtd_tests/mocks/mock_api.py

@@ -4,7 +4,7 @@
 
 from search.parse_json import process_file
 
-base_dir = os.path.dirname(__file__)
+base_dir = os.path.dirname(os.path.dirname(__file__))
 
 class TestHacks(TestCase):