From 92b161c33e104193d41ea08341d20abbefe6b0d2 Mon Sep 17 00:00:00 2001 From: David Buxton Date: Tue, 29 Mar 2016 13:06:47 +0100 Subject: [PATCH] Revert "Automatically create UserProfiles" --- cabot/cabotapp/models.py | 6 ------ cabot/cabotapp/tests/tests_basic.py | 8 +++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cabot/cabotapp/models.py b/cabot/cabotapp/models.py index f777b14..7b9a22a 100644 --- a/cabot/cabotapp/models.py +++ b/cabot/cabotapp/models.py @@ -1,5 +1,4 @@ from django.db import models -from django.db.models.signals import post_save from django.conf import settings from django.core.exceptions import ValidationError from polymorphic import PolymorphicModel @@ -914,11 +913,6 @@ class UserProfile(models.Model): hipchat_alias = models.CharField(max_length=50, blank=True, default='') fallback_alert_user = models.BooleanField(default=False) -def create_user_profile(sender, instance, created, **kwargs): - if created: - UserProfile.objects.create(user=instance) - -post_save.connect(create_user_profile, sender=User) class Shift(models.Model): start = models.DateTimeField() diff --git a/cabot/cabotapp/tests/tests_basic.py b/cabot/cabotapp/tests/tests_basic.py index 029807a..75a802b 100644 --- a/cabot/cabotapp/tests/tests_basic.py +++ b/cabot/cabotapp/tests/tests_basic.py @@ -23,7 +23,7 @@ from mock import Mock, patch from cabot.cabotapp.models import ( GraphiteStatusCheck, JenkinsStatusCheck, HttpStatusCheck, ICMPStatusCheck, Service, Instance, - StatusCheckResult, minimize_targets) + StatusCheckResult, UserProfile, minimize_targets) from cabot.cabotapp.views import StatusCheckReportForm from cabot.cabotapp.alert import send_alert from cabot.cabotapp.graphite import parse_metric @@ -877,8 +877,10 @@ class TestAlerts(LocalTestCase): def setUp(self): super(TestAlerts, self).setUp() - self.user.profile.hipchat_alias = "test_user_hipchat_alias" - self.user.profile.save() + self.user_profile = UserProfile.objects.create( + user = self.user, + hipchat_alias = "test_user_hipchat_alias",) + self.user_profile.save() self.service.users_to_notify.add(self.user) self.service.update_status()