update test

zwunix · Nov 4, 2018 · d74014d · d74014d
1 parent 4edf7f8
commit d74014d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/server/website/tests/test_tasks.py b/server/website/tests/test_tasks.py
@@ -7,7 +7,7 @@
 import numpy as np
 from django.test import TestCase, override_settings
 
-from website.models import Workload, PipelineRun, PipelineData
+from website.models import Workload, PipelineRun, PipelineData, Result
 from website.tasks.periodic_tasks import (run_background_tasks,
                                           aggregate_data,
                                           run_workload_characterization,
@@ -69,7 +69,8 @@ class AggregateTestCase(TestCase):
     def testValidWorkload(self):
         workloads = Workload.objects.all()
         valid_workload = workloads[0]
-        dicts = aggregate_data(valid_workload)
+        wkld_results = Result.objects.filter(workload=valid_workload)
+        dicts = aggregate_data(wkld_results)
         keys = ['data', 'rowlabels', 'columnlabels']
         for d in dicts:
             for k in keys:
@@ -82,7 +83,8 @@ class PrunedMetricTestCase(TestCase):
 
     def testValidPrunedMetrics(self):
         workloads = Workload.objects.all()
-        metric_data = aggregate_data(workloads[0])[1]
+        wkld_results = Result.objects.filter(workload=workloads[0])
+        metric_data = aggregate_data(wkld_results)[1]
         pruned_metrics = run_workload_characterization(metric_data)
         for m in pruned_metrics:
             self.assertIn(m, metric_data['columnlabels'])
@@ -94,7 +96,8 @@ class RankedKnobTestCase(TestCase):
 
     def testValidImportantKnobs(self):
         workloads = Workload.objects.all()
-        knob_data, metric_data = aggregate_data(workloads[0])
+        wkld_results = Result.objects.filter(workload=workloads[0])
+        knob_data, metric_data = aggregate_data(wkld_results)
 
         # instead of doing actual metric pruning by factor analysis / clustering,
         # just randomly select 5 nonconstant metrics