Bug 1320936 - Drop result_set_id columns from alert summary table

mozilla · Dec 19, 2016 · 1df5b79 · 1df5b79
1 parent 0070e18
commit 1df5b79
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -588,8 +588,6 @@ def test_perf_alert_summary(test_repository, result_set_stored, test_perf_framew
     return PerformanceAlertSummary.objects.create(
         repository=test_repository,
         framework=test_perf_framework,
-        prev_result_set_id=1,
-        result_set_id=2,
         prev_push_id=1,
         push_id=2,
         manually_created=False,

diff --git a/tests/etl/test_perf_data_adapters.py b/tests/etl/test_perf_data_adapters.py
@@ -390,9 +390,7 @@ def test_alert_generation(test_project, test_repository,
     if expected_num_alerts > 0:
         assert 1 == PerformanceAlertSummary.objects.all().count()
         summary = PerformanceAlertSummary.objects.get(id=1)
-        assert summary.result_set_id is None
         assert summary.push_id == 16
-        assert summary.prev_result_set_id is None
         assert summary.prev_push_id == 15
     else:
         assert 0 == PerformanceAlertSummary.objects.all().count()

diff --git a/tests/perfalert/test_alert_modification.py b/tests/perfalert/test_alert_modification.py
@@ -84,8 +84,6 @@ def test_alert_modification(test_repository, test_perf_signature,
         repository=test_repository,
         prev_push_id=3,
         push_id=4,
-        prev_result_set_id=3,
-        result_set_id=4,
         last_updated=datetime.datetime.now(),
         manually_created=False)
 

diff --git a/tests/perfalert/test_create_alerts.py b/tests/perfalert/test_create_alerts.py
@@ -24,8 +24,6 @@ def _verify_alert(alertid, expected_push_id, expected_prev_push_id,
     assert alert.classifier == expected_classifier
 
     summary = PerformanceAlertSummary.objects.get(id=alertid)
-    assert summary.result_set_id is None
-    assert summary.prev_result_set_id is None
     assert summary.push_id == expected_push_id
     assert summary.prev_push_id == expected_prev_push_id
     assert summary.status == expected_summary_status

diff --git a/tests/webapp/api/test_performance_alerts_api.py b/tests/webapp/api/test_performance_alerts_api.py
@@ -44,8 +44,6 @@ def test_alerts_put(webapp, result_set_stored, test_repository,
     PerformanceAlertSummary.objects.create(
         id=2,
         repository=test_repository,
-        prev_result_set_id=2,
-        result_set_id=3,
         prev_push_id=2,
         push_id=3,
         last_updated=datetime.datetime.now(),

diff --git a/treeherder/perf/migrations/0026_drop_alertsummary_rsid.py b/treeherder/perf/migrations/0026_drop_alertsummary_rsid.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('perf', '0025_rename_orm_property'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='performancealertsummary',
+            name='prev_result_set_id',
+        ),
+        migrations.RemoveField(
+            model_name='performancealertsummary',
+            name='result_set_id',
+        ),
+    ]
diff --git a/treeherder/perf/models.py b/treeherder/perf/models.py
@@ -124,9 +124,6 @@ class PerformanceAlertSummary(models.Model):
     repository = models.ForeignKey(Repository)
     framework = models.ForeignKey(PerformanceFramework, null=True)
 
-    prev_result_set_id = models.PositiveIntegerField(null=True)
-    result_set_id = models.PositiveIntegerField(null=True)
-
     prev_push = models.ForeignKey(Push, related_name='+')
     push = models.ForeignKey(Push, related_name='+')