diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:56:25 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:56:25 -0400 |
| commit | ad26f06953bb0db74a79e3bcc1f69f8b0efad521 (patch) | |
| tree | 3ebff8b013ae5af76eea1d61e1b1877df44f516a | |
| parent | cd029846fdc0c3d7ffc7f53caad4579e7e0e8725 (diff) | |
| download | passlib-ad26f06953bb0db74a79e3bcc1f69f8b0efad521.tar.gz | |
setup warning filters early in TestCase to work around HandlerCase warning issue w/ os_crypt proxying builtin bcrypt
| -rw-r--r-- | passlib/handlers/bcrypt.py | 1 | ||||
| -rw-r--r-- | passlib/tests/test_handlers.py | 7 | ||||
| -rw-r--r-- | passlib/tests/utils.py | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/passlib/handlers/bcrypt.py b/passlib/handlers/bcrypt.py index 890c656..4d12091 100644 --- a/passlib/handlers/bcrypt.py +++ b/passlib/handlers/bcrypt.py @@ -293,6 +293,7 @@ class bcrypt(uh.HasManyIdents, uh.HasRounds, uh.HasSalt, uh.HasManyBackends, uh. return str_to_uascii(hash[-31:]) def _calc_checksum_builtin(self, secret): + # XXX: silence this warnings under pypy1.7? it's almost fast enough. warn("SECURITY WARNING: Passlib is using it's pure-python bcrypt " "implementation, which is TOO SLOW FOR PRODUCTION USE. It is " "strongly recommended that you install py-bcrypt or bcryptor for " diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py index 61cdc8f..503b349 100644 --- a/passlib/tests/test_handlers.py +++ b/passlib/tests/test_handlers.py @@ -177,10 +177,9 @@ class _bcrypt_test(HandlerCase): #=============================================================== # override some methods #=============================================================== - def setUp(self): - super(_bcrypt_test, self).setUp() - if self.backend == "builtin": - warnings.filterwarnings("ignore", + def setUpWarnings(self): + super(_bcrypt_test, self).setUpWarnings() + warnings.filterwarnings("ignore", "SECURITY WARNING: .*pure-python bcrypt.*") def do_genconfig(self, **kwds): diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py index 5cbb427..aec23e8 100644 --- a/passlib/tests/utils.py +++ b/passlib/tests/utils.py @@ -210,6 +210,9 @@ class TestCase(unittest.TestCase): def setUp(self): super(TestCase, self).setUp() + self.setUpWarnings() + + def setUpWarnings(self): if self.resetWarningState: ctx = reset_warnings() ctx.__enter__() |