Skip to content

Commit

Permalink
Re-enable Trace method
Browse files Browse the repository at this point in the history
  • Loading branch information
frankwiles committed Jun 1, 2018
1 parent a8bdd10 commit 9014f2b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
16 changes: 10 additions & 6 deletions test_plus/test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import django

from distutils.version import LooseVersion

from django.conf import settings
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Permission
Expand Down Expand Up @@ -151,12 +155,12 @@ def patch(self, url_name, *args, **kwargs):
def head(self, url_name, *args, **kwargs):
return self.request('head', url_name, *args, **kwargs)

# def trace(self, url_name, *args, **kwargs):
# if LooseVersion(django.get_version()) >= LooseVersion('1.8.2'):
# return self.request('trace', url_name, *args, **kwargs)
# else:
# raise LookupError("client.trace is not available for your version of django. Please\
# update your django version.")
def trace(self, url_name, *args, **kwargs):
if LooseVersion(django.get_version()) >= LooseVersion('1.8.2'):
return self.request('trace', url_name, *args, **kwargs)
else:
raise LookupError("client.trace is not available for your version of django. Please\
update your django version.")

def options(self, url_name, *args, **kwargs):
return self.request('options', url_name, *args, **kwargs)
Expand Down
26 changes: 13 additions & 13 deletions test_project/test_app/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,19 @@ def test_head_follow(self):
res = self.head(url, follow=True)
self.assertTrue(res.status_code, 200)

# def test_trace(self):
# url = self.reverse('view-200')
# res = self.trace(url)
# self.assertTrue(res.status_code, 200)
#
# def test_trace_follow(self):
# url = self.reverse('view-redirect')
# # Expect 302 status code
# res = self.trace(url)
# self.assertTrue(res.status_code, 302)
# # Expect 200 status code
# res = self.trace(url, follow=True)
# self.assertTrue(res.status_code, 200)
def test_trace(self):
url = self.reverse('view-200')
res = self.trace(url)
self.assertTrue(res.status_code, 200)

def test_trace_follow(self):
url = self.reverse('view-redirect')
# Expect 302 status code
res = self.trace(url)
self.assertTrue(res.status_code, 302)
# Expect 200 status code
res = self.trace(url, follow=True)
self.assertTrue(res.status_code, 200)

def test_options(self):
url = self.reverse('view-200')
Expand Down

0 comments on commit 9014f2b

Please sign in to comment.