From 09a88f768df07db86b78615da391d3bc72a2410e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Sat, 28 Oct 2017 18:08:40 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20username=20conflicts=20with=20test=20suit?= =?UTF-8?q?e=20and=20the=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …check_supportBDS_migrations script. --- cof/management/commands/check_olddata.py | 6 +++--- cof/migrations/0008_py3.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cof/management/commands/check_olddata.py b/cof/management/commands/check_olddata.py index 8fdac0e4..dc1ccd47 100644 --- a/cof/management/commands/check_olddata.py +++ b/cof/management/commands/check_olddata.py @@ -31,21 +31,21 @@ class Command(BaseCommand): def check_users(self): self.stdout.write("* Utilisateurs... ", ending='') - self.u1 = User.objects.get(username='user1') + self.u1 = User.objects.get(username='cbds_user1') assert self.u1.profile.login_clipper == 'user1' assert self.g_staff in self.u1.groups.all() assert self.g_members in self.u1.groups.all() assert self.u1.has_perm('cof.buro') assert self.u1.has_perm('cof.member') - self.u2 = User.objects.get(username='user2') + self.u2 = User.objects.get(username='cbds_user2') assert self.u2.profile.login_clipper == 'user2' assert self.g_staff not in self.u2.groups.all() assert self.g_members in self.u2.groups.all() assert not self.u2.has_perm('cof.buro') assert self.u2.has_perm('cof.member') - self.u3 = User.objects.get(username='user3') + self.u3 = User.objects.get(username='cbds_user3') assert self.u3.profile.login_clipper == 'user3' assert self.g_staff not in self.u3.groups.all() assert self.g_members not in self.u3.groups.all() diff --git a/cof/migrations/0008_py3.py b/cof/migrations/0008_py3.py index 99aa2f9f..b758e996 100644 --- a/cof/migrations/0008_py3.py +++ b/cof/migrations/0008_py3.py @@ -34,13 +34,13 @@ def load_olddata(apps, schema_editor): ) # Setup users. - u1 = load_user(apps, 'user1', is_cof=True) + u1 = load_user(apps, 'cbds_user1', is_cof=True) u1.profile.is_buro = True u1.profile.save() - u2 = load_user(apps, 'user2', is_cof=True) + u2 = load_user(apps, 'cbds_user2', is_cof=True) - u3 = load_user(apps, 'user3') + u3 = load_user(apps, 'cbds_user3') # Setup clubs. Club = apps.get_model('cof', 'Club')