BUG: stdout is bytes on python3

codespeed/commits/mercurial.py

@@ -63,7 +63,7 @@ def getlogs(endrev, startrev):
     if p.returncode != 0:
         raise CommitLogError(str(stderr))
     else:
-        stdout = stdout.rstrip('\n')  # Remove last newline
+        stdout = stdout.decode('utf-8').rstrip('\n')  # Remove last newline
         logs = []
         for log in stdout.split("=newlog=\n"):
             elements = []

codespeed/models.py

@@ -475,7 +475,7 @@ def get_changes_table(self, trend_depth=10, force_save=False):
                     val_max = "-"
 
                 # Calculate percentage change relative to previous result
-                result = resobj.value
+                result = max(resobj.value, 0)
                 change = "-"
                 if len(change_list):
                     c = change_list.filter(benchmark=bench)

codespeed/settings.py

@@ -2,7 +2,7 @@
 """Default settings for Codespeed"""
 
 ## General default options ##
-WEBSITE_NAME = "MySpeedSite" # This name will be used in the reports RSS feed
+WEBSITE_NAME = "PyPy's Speed Center" # This name will be used in the reports RSS feed
 
 DEF_ENVIRONMENT = None # Name of the environment which should be selected as default
 

codespeed/static/css/main.css

@@ -119,7 +119,7 @@ div#presentation div.menubox {
 }
 div#presentation div.menubox:hover { border: 5px solid #FFCE9C; }
 
-div#presentation p { height: 5em; padding-left: 120px; }
+div#presentation div.menubox p { height: 5em; padding-left: 120px; }
 
 div#presentation div#changes p {
     background: url(../images/changes.png) no-repeat;

codespeed/tests/test_commits.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+from datetime import datetime, timedelta
+import subprocess
+import tempfile
+import os
+
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from codespeed.models import (Project, Benchmark, Revision, Branch, Executable,
+                              Environment, Result, Report)
+
+hgdir = ''
+
+def setUpModule():
+    global hgdir
+    hgdir = tempfile.TemporaryDirectory()
+    subprocess.check_call(['hg', 'init'], cwd=hgdir.name)
+    # Add some commits
+    readme = os.path.join(hgdir.name, 'README.md')
+    file1 = os.path.join(hgdir.name, 'file1.py')
+    with open(readme, 'w') as hg_file:
+        hg_file.write('readme')
+    subprocess.check_call(['hg', 'add', readme], cwd=hgdir.name)
+    subprocess.check_call(['hg', 'commit', '-m', "first commit"], cwd=hgdir.name)
+    with open(file1, 'w') as hg_file:
+        hg_file.write('value = 10')
+    subprocess.check_call(['hg', 'add', file1], cwd=hgdir.name)
+    subprocess.check_call(['hg', 'commit', '-m', "second commit"], cwd=hgdir.name)
+
+def tearDownModule():
+    hgdir.cleanup()
+
+class TestMercurial(TestCase):
+
+    def setUp(self):
+        self.days = 0
+        self.hgdir = hgdir.name
+        self.starttime = datetime.now() + timedelta(days=-100)
+
+        Project(repo_type='M', name='pro',
+                repo_path=str(self.hgdir)).save()
+        self.pro = Project.objects.get(name='pro')
+
+        Branch(project=self.pro, name='default').save()
+        self.b = Branch.objects.get(name='default')
+
+        Environment(name='Walden Pond').save()
+        Executable(name='walden', project=self.pro).save()
+        Benchmark(name='TestBench').save()
+
+        self.env = Environment.objects.get(name='Walden Pond')
+        self.exe = Executable.objects.get(name='walden')
+        self.bench = Benchmark.objects.get(name='TestBench')
+        cmd = ['hg', '-R', self.hgdir, 'id', '-r', '1']
+        self.cid = subprocess.check_output(cmd).split()[0]
+        Revision(commitid=self.cid.decode('utf-8'), date=self.starttime, branch=self.b,
+                 project=self.pro).save()
+
+    def test_hg(self):
+        response = self.client.get(reverse('displaylogs'), {'revisionid':1})
+        assert response.status_code == 200, 'expected 200 got %d' % response.status_code

codespeed/views.py

@@ -94,12 +94,20 @@ def gethistoricaldata(request):
     # Fetch Baseline data
     baseline_exe = Executable.objects.get(
         name=settings.DEF_BASELINE['executable'])
-    baseline_lastrev = Revision.objects.filter(
-        branch__project=baseline_exe.project).order_by('-date')[0]
+    baseline_revs = Revision.objects.filter(
+        branch__project=baseline_exe.project).order_by('-date')
+    baseline_lastrev = baseline_revs[0]
+    for rev in baseline_revs:
+        baseline_results = Result.objects.filter(
+            executable=baseline_exe, revision=rev, environment=env)
+        if baseline_results:
+            baseline_lastrev = rev
+            break
+    if len(baseline_results) == 0:
+        logger.error('Could not find results for {} rev="{}" env="{}"'.format(
+                baseline_exe, baseline_lastrev, env))
     data['baseline'] = '{} {}'.format(
         settings.DEF_BASELINE['executable'], baseline_lastrev.tag)
-    baseline_results = Result.objects.filter(
-        executable=baseline_exe, revision=baseline_lastrev, environment=env)
 
     default_exe = Executable.objects.get(name=settings.DEF_EXECUTABLE)
     default_branch = Branch.objects.get(
@@ -108,21 +116,24 @@ def gethistoricaldata(request):
 
     # Fetch tagged revisions for default executable
     default_taggedrevs = Revision.objects.filter(
-        branch=default_branch
-    ).exclude(tag="").order_by('date')
-    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs]
+            branch=default_branch
+        ).exclude(tag="").order_by('date')
     default_results = {}
     for rev in default_taggedrevs:
-        default_results[rev.tag] = Result.objects.filter(
+        res = Result.objects.filter(
             executable=default_exe, revision=rev, environment=env)
-
+        if not res:
+            logger.info('no results for %s %s %s' % (str(default_exe), str(rev), str(env)))
+            continue
+        default_results[rev.tag] = res
+    data['tagged_revs'] = [rev.tag for rev in default_taggedrevs if rev.tag in default_results]
     # Fetch data for latest results
     revs = Revision.objects.filter(
         branch=default_branch).order_by('-date')[:5]
     default_lastrev = None
     for i in range(4):
         default_lastrev = revs[i]
-        if default_lastrev.results.filter(executable=default_exe):
+        if default_lastrev.results.filter(executable=default_exe, environment=env):
             break
         default_lastrev = None
     if default_lastrev is None:
@@ -892,7 +903,6 @@ def add_result(request):
         return HttpResponseBadRequest(response)
     else:
         create_report_if_enough_data(response[0], response[1], response[2])
-        logger.debug("add_result: completed")
         return HttpResponse("Result data saved successfully", status=202)
 
 
@@ -917,15 +927,11 @@ def add_json_results(request):
         else:
             unique_reports.add(response)
 
-    logger.debug("add_json_results: about to create reports")
     for rep in unique_reports:
         create_report_if_enough_data(rep[0], rep[1], rep[2])
 
-    logger.debug("add_json_results: completed")
-
     return HttpResponse("All result data saved successfully", status=202)
 
-
 def django_has_content_type():
     return (django.VERSION[0] > 1 or
             (django.VERSION[0] == 1 and django.VERSION[1] >= 6))

deploy-requirements.txt

@@ -0,0 +1,3 @@
+.
+psycopg2==2.7.7
+gunicorn==19.9.0