From a9abd3c2cde5b38e28854320b8a205a864c389e6 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 28 Jan 2016 20:12:00 +0000 Subject: [PATCH] Tweak factories to not randomly create keys that violate constraints. Commit ready for merge - Legacy-Id: 10756 --- ietf/group/factories.py | 2 +- ietf/meeting/factories.py | 2 +- ietf/nomcom/factories.py | 2 +- ietf/person/factories.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ietf/group/factories.py b/ietf/group/factories.py index 9cef50afd..ca2a37a9b 100644 --- a/ietf/group/factories.py +++ b/ietf/group/factories.py @@ -7,4 +7,4 @@ class GroupFactory(factory.DjangoModelFactory): model = Group name = factory.Faker('sentence',nb_words=6) - acronym = factory.Faker('word') + acronym = factory.Sequence(lambda n: 'acronym_%d' %n) diff --git a/ietf/meeting/factories.py b/ietf/meeting/factories.py index b6b81e6ae..469c62219 100644 --- a/ietf/meeting/factories.py +++ b/ietf/meeting/factories.py @@ -78,7 +78,7 @@ class ScheduleFactory(factory.DjangoModelFactory): model = Schedule meeting = factory.SubFactory(MeetingFactory) - name = factory.Faker('text',max_nb_chars=16) + name = factory.Sequence(lambda n: 'schedule_%d'%n) owner = factory.SubFactory(PersonFactory) class TimeSlotFactory(factory.DjangoModelFactory): diff --git a/ietf/nomcom/factories.py b/ietf/nomcom/factories.py index c2059acfa..ef639d2e5 100644 --- a/ietf/nomcom/factories.py +++ b/ietf/nomcom/factories.py @@ -135,7 +135,7 @@ class NomineeFactory(factory.DjangoModelFactory): nomcom = factory.SubFactory(NomComFactory) person = factory.SubFactory(PersonFactory) - email = factory.LazyAttribute(lambda n: n.person.email()) + email = factory.LazyAttribute(lambda obj: obj.person.email()) class FeedbackFactory(factory.DjangoModelFactory): class Meta: diff --git a/ietf/person/factories.py b/ietf/person/factories.py index 2cc7e006e..c2da7ca78 100644 --- a/ietf/person/factories.py +++ b/ietf/person/factories.py @@ -15,7 +15,7 @@ class UserFactory(factory.DjangoModelFactory): first_name = factory.Faker('first_name') last_name = factory.Faker('last_name') - email = factory.LazyAttribute(lambda u: '%s.%s@%s'%(u.first_name,u.last_name,fake.domain_name())) + email = factory.LazyAttributeSequence(lambda u, n: '%s.%s_%d@%s'%(u.first_name,u.last_name,n,fake.domain_name())) username = factory.LazyAttribute(lambda u: u.email) @factory.post_generation @@ -53,6 +53,6 @@ class EmailFactory(factory.DjangoModelFactory): model = Email django_get_or_create = ('address',) - address = '%s.%s@%s' % (fake.first_name(),fake.last_name(),fake.domain_name()) + address = factory.Sequence(lambda n:'%s.%s_%d@%s' % (fake.first_name(),fake.last_name(),n,fake.domain_name())) active = True primary = False