From 8729b3c625f9914a23dddd9edbef7584e849f40c Mon Sep 17 00:00:00 2001
From: jurov <rini17@gmail.com>
Date: Mon, 15 Dec 2014 20:12:32 +0100
Subject: [PATCH] Merged with master, fixed imports for py3
---
repoze/who/tests/test_classifiers.py | 45 ++++++++++++---------------------------------
1 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/repoze/who/tests/test_classifiers.py b/repoze/who/tests/test_classifiers.py
index 44af225..a6834a2 100644
--- a/repoze/who/tests/test_classifiers.py
+++ b/repoze/who/tests/test_classifiers.py
@@ -1,14 +1,7 @@
import unittest
-class _Base(unittest.TestCase):
- def failUnless(self, predicate, message=''):
- self.assertTrue(predicate, message) # Nannies go home!
-
- def failIf(self, predicate, message=''):
- self.assertFalse(predicate, message) # Nannies go home!
-
-class TestDefaultRequestClassifier(_Base):
+class TestDefaultRequestClassifier(unittest.TestCase):
def _getFUT(self):
from repoze.who.classifiers import default_request_classifier
@@ -24,7 +17,7 @@
def test_conforms_to_IRequestClassifier(self):
from repoze.who.interfaces import IRequestClassifier
- self.failUnless(IRequestClassifier.providedBy(self._getFUT()))
+ self.assertTrue(IRequestClassifier.providedBy(self._getFUT()))
def test_classify_dav_method(self):
classifier = self._getFUT()
@@ -71,60 +64,46 @@
self.assertEqual(result, 'browser')
-class TestDefaultChallengeDecider(_Base):
+class TestDefaultChallengeDecider(unittest.TestCase):
def _getFUT(self):
from repoze.who.classifiers import default_challenge_decider
return default_challenge_decider
- def _makeEnviron(self, kw=None):
- environ = {}
- environ['wsgi.version'] = (1,0)
- if kw is not None:
- environ.update(kw)
- return environ
-
def test_conforms_to_IChallengeDecider(self):
from repoze.who.interfaces import IChallengeDecider
- self.failUnless(IChallengeDecider.providedBy(self._getFUT()))
+ self.assertTrue(IChallengeDecider.providedBy(self._getFUT()))
def test_challenges_on_401(self):
decider = self._getFUT()
- self.failUnless(decider({}, '401 Unauthorized', []))
+ self.assertTrue(decider({}, '401 Unauthorized', []))
def test_doesnt_challenges_on_non_401(self):
decider = self._getFUT()
- self.failIf(decider({}, '200 Ok', []))
+ self.assertFalse(decider({}, '200 Ok', []))
-class TestPassthroughChallengeDecider(_Base):
+class TestPassthroughChallengeDecider(unittest.TestCase):
def _getFUT(self):
from repoze.who.classifiers import passthrough_challenge_decider
return passthrough_challenge_decider
- def _makeEnviron(self, kw=None):
- environ = {}
- environ['wsgi.version'] = (1,0)
- if kw is not None:
- environ.update(kw)
- return environ
-
def test_conforms_to_IChallengeDecider(self):
from repoze.who.interfaces import IChallengeDecider
- self.failUnless(IChallengeDecider.providedBy(self._getFUT()))
+ self.assertTrue(IChallengeDecider.providedBy(self._getFUT()))
def test_challenges_on_bare_401(self):
decider = self._getFUT()
- self.failUnless(decider({}, '401 Unauthorized', []))
+ self.assertTrue(decider({}, '401 Unauthorized', []))
def test_doesnt_challenges_on_non_401(self):
decider = self._getFUT()
- self.failIf(decider({}, '200 Ok', []))
+ self.assertFalse(decider({}, '200 Ok', []))
def test_doesnt_challenges_on_401_with_WWW_Authenticate(self):
decider = self._getFUT()
- self.failIf(decider({}, '401 Ok', [('WWW-Authenticate', 'xxx')]))
+ self.assertFalse(decider({}, '401 Ok', [('WWW-Authenticate', 'xxx')]))
def test_doesnt_challenges_on_401_with_text_html(self):
decider = self._getFUT()
- self.failIf(decider({}, '401 Ok', [('Content-Type', 'text/html')]))
+ self.assertFalse(decider({}, '401 Ok', [('Content-Type', 'text/html')]))
--
Gitblit v1.9.3