File tree 6 files changed +16
-4
lines changed 6 files changed +16
-4
lines changed Original file line number Diff line number Diff line change 2
2
import os
3
3
import shutil
4
4
import logging
5
+ import tempfile
5
6
from collections import OrderedDict
6
7
7
8
from mock import patch
@@ -18,7 +19,7 @@ class RTDTestCase(TestCase):
18
19
def setUp (self ):
19
20
self .original_DOCROOT = settings .DOCROOT
20
21
self .cwd = os .path .dirname (__file__ )
21
- self .build_dir = os . path . join ( self . cwd , 'builds' )
22
+ self .build_dir = tempfile . mkdtemp ( )
22
23
log .info ("build dir: %s" , self .build_dir )
23
24
if not os .path .exists (self .build_dir ):
24
25
os .makedirs (self .build_dir )
Original file line number Diff line number Diff line change 7
7
from django_dynamic_fixture import get , new
8
8
9
9
from corsheaders .middleware import CorsMiddleware
10
+ from mock import patch
10
11
11
12
from readthedocs .core .middleware import SubdomainMiddleware
12
13
from readthedocs .projects .models import Project , Domain
@@ -95,10 +96,12 @@ def test_request_header_uppercase(self):
95
96
self .assertEqual (request .slug , 'pip' )
96
97
97
98
@override_settings (USE_SUBDOMAIN = True )
99
+ # no need to do a real dns query so patch cname_to_slug
100
+ @patch ('readthedocs.core.middleware.cname_to_slug' , new = lambda x : 'doesnt' )
98
101
def test_use_subdomain_on (self ):
99
102
request = self .factory .get (self .url , HTTP_HOST = 'doesnt.really.matter' )
100
103
ret_val = self .middleware .process_request (request )
101
- self .assertEqual (ret_val , None )
104
+ self .assertIsNone (ret_val , None )
102
105
103
106
104
107
class TestCORSMiddleware (TestCase ):
Original file line number Diff line number Diff line change @@ -13,6 +13,9 @@ class CommunityTestSettings(CommunityDevSettings):
13
13
PRODUCTION_DOMAIN = 'readthedocs.org'
14
14
GROK_API_HOST = 'http://localhost:8888'
15
15
16
+ DEBUG = False
17
+ TEMPLATE_DEBUG = False
18
+
16
19
17
20
CommunityTestSettings .load_settings (__name__ )
18
21
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ django-extensions==1.7.4
18
18
djangorestframework==3.5.4
19
19
django-vanilla-views==1.0.4
20
20
jsonfield==1.0.3
21
- pytest-django==2.8.0
22
21
23
22
requests==2.3.0
24
23
slumber==0.6.0
Original file line number Diff line number Diff line change
1
+ -r pip.txt
2
+
3
+ pytest-django==2.8.0
4
+ pytest-xdist==1.16.0
5
+ apipkg==1.4
6
+ execnet==1.4.1
Original file line number Diff line number Diff line change 8
8
DJANGO_SETTINGS_MODULE =settings.test
9
9
LANG =C
10
10
DJANGO_SETTINGS_SKIP_LOCAL =True
11
- deps = -r{toxinidir}/requirements/pip .txt
11
+ deps = -r{toxinidir}/requirements/testing .txt
12
12
changedir = {toxinidir}/readthedocs
13
13
commands =
14
14
py.test {posargs}
You can’t perform that action at this time.
0 commit comments