simono41/snappass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #83 from samueldg/enhancement/modernize-tests

Browse source 
Enhancement/modernize tests
This commit is contained in:
Nicholas Charriere 2018-05-07 19:19:46 -07:00 committed by GitHub
commit 5ddecd4e64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests.py
View file

@ -22,14 +22,14 @@ class SnapPassTestCase(TestCase):
key = snappass.set_password(password, 30) key = snappass.set_password(password, 30)
self.assertEqual(password, snappass.get_password(key)) self.assertEqual(password, snappass.get_password(key))
# Assert that we can't look this up a second time. # Assert that we can't look this up a second time.
self.assertEqual(None, snappass.get_password(key)) self.assertIsNone(snappass.get_password(key))
def test_password_is_not_stored_in_plaintext(self): def test_password_is_not_stored_in_plaintext(self):
password = "trustno1" password = "trustno1"
token = snappass.set_password(password, 30) token = snappass.set_password(password, 30)
redis_key = token.split(snappass.TOKEN_SEPARATOR)[0] redis_key = token.split(snappass.TOKEN_SEPARATOR)[0]
stored_password_text = snappass.redis_client.get(redis_key).decode('utf-8') stored_password_text = snappass.redis_client.get(redis_key).decode('utf-8')
self.assertFalse(password in stored_password_text) self.assertNotIn(password, stored_password_text)
def test_returned_token_format(self): def test_returned_token_format(self):
password = "trustsome1" password = "trustsome1"
@ -97,7 +97,7 @@ class SnapPassTestCase(TestCase):
# Expire functionality must be explicitly invoked using do_expire(time). # Expire functionality must be explicitly invoked using do_expire(time).
# mockredis does not support automatic expiration at this time # mockredis does not support automatic expiration at this time
snappass.redis_client.do_expire() snappass.redis_client.do_expire()
self.assertEqual(None, snappass.get_password(key)) self.assertIsNone(snappass.get_password(key))
class SnapPassRoutesTestCase(TestCase): class SnapPassRoutesTestCase(TestCase):
@ -110,7 +110,7 @@ class SnapPassRoutesTestCase(TestCase):
password = "I like novelty kitten statues!" password = "I like novelty kitten statues!"
key = snappass.set_password(password, 30) key = snappass.set_password(password, 30)
rv = self.app.get('/{0}'.format(key)) rv = self.app.get('/{0}'.format(key))
self.assertTrue(password in rv.get_data(as_text=True)) self.assertIn(password, rv.get_data(as_text=True))
def test_bots_denial(self): def test_bots_denial(self):
""" """
@ -131,7 +131,7 @@ class SnapPassRoutesTestCase(TestCase):
for ua in a_few_sneaky_bots: for ua in a_few_sneaky_bots:
rv = self.app.get('/{0}'.format(key), headers={ 'User-Agent': ua }) rv = self.app.get('/{0}'.format(key), headers={ 'User-Agent': ua })
self.assertEqual(rv.status_code, 404) self.assertEqual(404, rv.status_code)
if __name__ == '__main__': if __name__ == '__main__':

2
tox.ini
View file

@ -7,7 +7,7 @@ setenv =
commands = commands =
pip install -r requirements.txt pip install -r requirements.txt
pip install -r dev-requirements.txt pip install -r dev-requirements.txt
py.test --junitxml=junit-{envname}.xml --cov-report xml tests.py pytest --junitxml=junit-{envname}.xml --cov-report xml tests.py
[testenv:flake8] [testenv:flake8]
commands = commands =