require source when uploading

Author: mattip

codespeed/results.py

@@ -32,6 +32,7 @@ def validate_result(item):
         'benchmark',
         'environment',
         'result_value',
+        'source',
     ]
 
     error = True
@@ -41,7 +42,7 @@ def validate_result(item):
         elif key in item and item[key] == "":
             return 'Value for key "' + key + '" empty in request', error
 
-    if 'source' in item and item['source'] not in dict(Benchmark.S_TYPES):
+    if item['source'] not in dict(Benchmark.S_TYPES):
         return 'Invalid source "%s"' % item['source'], error
 
     try:
@@ -73,9 +74,8 @@ def save_result(data, update_repo=True):
     p, created = Project.objects.get_or_create(name=data["project"])
     branch, created = Branch.objects.get_or_create(name=data["branch"],
                                                    project=p)
-    source = data.get("source", "legacy")
     b, created = Benchmark.objects.get_or_create(
-        name=data["benchmark"], source=source)
+        name=data["benchmark"], source=data["source"])
 
     if created:
         if "description" in data:

codespeed/tests/test_views.py

@@ -29,6 +29,7 @@ def setUp(self):
             'benchmark': 'float',
             'environment': 'Dual Core',
             'result_value': 456,
+            'source': 'legacy',
         }
 
     def test_add_correct_result(self):
@@ -190,11 +191,13 @@ def test_source_set_on_new_benchmark(self):
         b = Benchmark.objects.get(name='newbench')
         self.assertEqual(b.source, 'pyperformance')
 
-    def test_source_defaults_to_legacy(self):
-        """A payload without a source creates a 'legacy' Benchmark"""
-        self.client.post(self.path, self.data)
-        b = Benchmark.objects.get(name='float')
-        self.assertEqual(b.source, 'legacy')
+    def test_missing_source_rejected(self):
+        """A payload without a source is rejected instead of defaulting"""
+        modified_data = copy.deepcopy(self.data)
+        del modified_data['source']
+        response = self.client.post(self.path, modified_data)
+        self.assertEqual(response.status_code, 400)
+        self.assertFalse(Benchmark.objects.filter(name='float').exists())
 
     def test_same_name_different_source_are_distinct(self):
         """The same name in a different suite is a separate Benchmark"""
@@ -245,28 +248,32 @@ def setUp(self):
              'executable': 'pypy-c',
              'benchmark': 'Richards',
              'environment': 'bigdog',
-             'result_value': 456},
+             'result_value': 456,
+             'source': 'legacy'},
             {'commitid': '456',
              'project': 'pypy',
              'branch': 'default',
              'executable': 'pypy-c',
              'benchmark': 'Richards',
              'environment': 'bigdog',
-             'result_value': 457},
+             'result_value': 457,
+             'source': 'legacy'},
             {'commitid': '456',
              'project': 'pypy',
              'branch': 'default',
              'executable': 'pypy-c',
              'benchmark': 'Richards2',
              'environment': 'bigdog',
-             'result_value': 34},
+             'result_value': 34,
+             'source': 'legacy'},
             {'commitid': '789',
              'project': 'pypy',
              'branch': 'default',
              'executable': 'pypy-c',
              'benchmark': 'Richards',
              'environment': 'bigdog',
-             'result_value': 458},
+             'result_value': 458,
+             'source': 'legacy'},
         ]
 
     def test_get_returns_405(self):
@@ -452,6 +459,7 @@ def setUp(self):
             'benchmark': 'float',
             'environment': 'Dual Core',
             'result_value': 200,
+            'source': 'legacy',
         }
         resp = self.client.post(reverse('add-result'),
                                 self.data)

tools/pypy/savecpython.py

@@ -31,6 +31,7 @@ def save(project, revision, results, options, executable, host, testing=False):
             'environment': host,
             'result_value': value,
             'result_date': current_date,
+            'source': 'legacy',
         }
         if res_type == "ComparisonResult":
             data['std_dev'] = results['std_changed']

tools/pypy/saveresults.py

@@ -79,6 +79,7 @@ def save(project, revision, results, executable, host, url, testing=False,
             'environment': host,
             'result_value': value,
             'branch': branch,
+            'source': 'legacy',
         }]
         if not value:
             print("Ignoring skipped result", data)

tools/save_multiple_results.py

@@ -18,7 +18,8 @@
         "executable": "myexe O3 64bits",
         "benchmark": "float",
         "environment": "Dual Core",
-        "result_value": 2500.0
+        "result_value": 2500.0,
+        "source": "legacy"
     },
     {
         "commitid": "8",
@@ -27,7 +28,8 @@
         "executable": "myexe O3 64bits",
         "benchmark": "int",
         "environment": "Dual Core",
-        "result_value": 1100
+        "result_value": 1100,
+        "source": "legacy"
     }
 ]
 

tools/save_single_result.py

@@ -20,6 +20,7 @@
     'benchmark': 'float',
     'environment': "Dual Core",
     'result_value': 4000,
+    'source': 'legacy',  # 'legacy' or 'pyperformance'
 }
 
 # Optional fields