Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

Made the secret_id func more reusable. Added a test that is none.

Browse source
This commit is contained in:
Martin Mahner 2014-01-07 12:57:06 +01:00
parent c687ab125a
commit ebdd36cfeb
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dpaste/models.py
View file

@ -15,8 +15,8 @@ L = getattr(settings, 'DPASTE_SLUG_LENGTH', 4)
T = getattr(settings, 'DPASTE_SLUG_CHOICES', T = getattr(settings, 'DPASTE_SLUG_CHOICES',
'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ1234567890') 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ1234567890')
def generate_secret_id(length=L): def generate_secret_id(length=L, alphabet=T):
return ''.join([R.choice(T) for i in range(L)]) return ''.join([R.choice(alphabet) for i in range(length)])
class Snippet(models.Model): class Snippet(models.Model):
secret_id = models.CharField(_(u'Secret ID'), max_length=255, blank=True) secret_id = models.CharField(_(u'Secret ID'), max_length=255, blank=True)

13
dpaste/tests/test_snippet.py
View file

@ -316,3 +316,16 @@ class SnippetTestCase(TestCase):
from dpaste.highlight import pygmentize from dpaste.highlight import pygmentize
pygmentize('code', lexer_name='python') pygmentize('code', lexer_name='python')
pygmentize('code', lexer_name='doesnotexist') pygmentize('code', lexer_name='doesnotexist')
# This is actually a bad test. It is possible to have duplicates
# because even if its random, it can generate two random, equal strings.
#
# def test_random_slug_generation(self):
# """
# Generate 1000 random slugs, make sure we have no duplicates.
# """
# from dpaste.models import generate_secret_id
# result_list = []
# for i in range(0, 1000):
# result_list.append(generate_secret_id())
# self.assertEqual(len(set(result_list)), 1000)