Merge pull request #60 from mattip/fix-tests

fix test failures and add a github action to run them

Author: mattip

.github/workflows/tests.yml

@@ -0,0 +1,23 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies
+        run: pip install -e .
+
+      - name: Run tests
+        run: python manage.py test codespeed --settings=codespeed.tests.settings

codespeed/commits/git.py

@@ -79,7 +79,7 @@ def getlogs(endrev, startrev):
             logger.debug('Failed to get tag', exc_info=True)
 
         tag = stdout.strip() if p.returncode == 0 else ""
-        date = datetime.datetime.fromtimestamp(
+        date = datetime.datetime.utcfromtimestamp(
             int(date_t)).strftime("%Y-%m-%d %H:%M:%S")
 
         logs.append({

codespeed/commits/tests/test_git.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from django.test import TestCase, override_settings
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from codespeed.commits.git import getlogs
 from codespeed.models import Project, Revision, Branch, Environment
@@ -48,7 +48,7 @@ def side_effect(cmd, *args, **kwargs):
 
         # then
         expected = {
-            'date': '2020-03-06 04:14:41',
+            'date': '2020-03-06 10:14:41',
             'message': 'msg',
             'commitid': 'long_id',
             'author': 'author',
@@ -57,4 +57,4 @@ def side_effect(cmd, *args, **kwargs):
             'short_commit_id': 'id',
             'tag': 'tag',
         }
-        self.assertEquals([expected], logs)
+        self.assertEqual([expected], logs)

codespeed/settings.py

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

codespeed/tests/settings.py

@@ -0,0 +1,53 @@
+import os
+from codespeed.settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+SECRET_KEY = 'test-secret-key-not-for-production'
+USE_TZ = False
+TIME_ZONE = 'UTC'
+
+INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.admin',
+    'django.contrib.staticfiles',
+    'codespeed',
+)
+
+MIDDLEWARE = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+)
+
+ROOT_URLCONF = 'speed_pypy.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+STATIC_URL = '/static/'
+REPOSITORY_BASE_PATH = '/tmp/codespeed-test-repos'

codespeed/tests/test_auth.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from django.test import TestCase, override_settings
 from django.http import HttpResponse

codespeed/tests/test_commits.py

@@ -58,5 +58,6 @@ def setUp(self):
                  project=self.pro).save()
 
     def test_hg(self):
-        response = self.client.get(reverse('displaylogs'), {'revisionid':1})
+        with self.settings(REPOSITORY_BASE_PATH=os.path.dirname(self.hgdir)):
+            response = self.client.get(reverse('displaylogs'), {'revisionid':1})
         assert response.status_code == 200, 'expected 200 got %d' % response.status_code

codespeed/tests/test_models.py

@@ -104,7 +104,7 @@ def test_good_benchmark_change_beats_bad_average_trend(self):
                 self.make_result(x, rev=s1, benchmark=b1)
         self.make_result(changes[-2] * .97, rev=s1, benchmark=b1)
         rep = self.make_report(s1)
-        self.assertEquals('green', rep.colorcode)
+        self.assertEqual('green', rep.colorcode)
         self.assertIn('b1', rep.summary)
 
     def test_good_average_change_beats_bad_average_trend(self):
@@ -116,7 +116,7 @@ def test_good_average_change_beats_bad_average_trend(self):
                 self.make_result(x, rev=s1, benchmark=b1)
         self.make_result(changes[-2] * .92, rev=s1, benchmark=b1)
         rep = self.make_report(s1)
-        self.assertEquals('green', rep.colorcode)
+        self.assertEqual('green', rep.colorcode)
         self.assertIn('Average', rep.summary)
 
     def test_good_change_beats_good_trend(self):
@@ -156,7 +156,7 @@ def test_bad_change_beats_good_trend(self):
         rep = self.make_report(s1)
         self.assertIn('b1', rep.summary)
         self.assertNotIn('trend', rep.summary)
-        self.assertEquals('red', rep.colorcode)
+        self.assertEqual('red', rep.colorcode)
 
     def test_bad_beats_good_change(self):
         b1 = self.make_bench('b1')
@@ -184,7 +184,7 @@ def test_bigger_bad_beats_smaller_bad(self):
 
         rep = self.make_report(s2)
         self.assertIn('b1', rep.summary)
-        self.assertEquals('red', rep.colorcode)
+        self.assertEqual('red', rep.colorcode)
 
     def test_multiple_quantities(self):
         b1 = self.make_bench('b1', quantity='Space', units='bytes')
@@ -195,8 +195,8 @@ def test_multiple_quantities(self):
         self.make_result(1.5, rev=s2, benchmark=b1)
 
         rep = self.make_report(s2)
-        self.assertRegexpMatches(rep.summary, '[sS]pace')
-        self.assertEquals('red', rep.colorcode)
+        self.assertRegex(rep.summary, '[sS]pace')
+        self.assertEqual('red', rep.colorcode)
 
     def make_result(self, value, rev=None, benchmark=None):
         from uuid import uuid4
@@ -280,18 +280,18 @@ def test_github_browsing_url(self):
 
         # It should work with https:// as well as git:// urls
         self.github_project.save()
-        self.assertEquals(self.github_project.commit_browsing_url,
+        self.assertEqual(self.github_project.commit_browsing_url,
                           'https://github.com/tobami/codespeed.git/'
                           'commit/{commitid}')
 
         self.github_project.repo_path = 'git://github.com/tobami/codespeed.git'
         self.github_project.save()
-        self.assertEquals(self.github_project.commit_browsing_url,
+        self.assertEqual(self.github_project.commit_browsing_url,
                           'https://github.com/tobami/codespeed.git/'
                           'commit/{commitid}')
 
         # If filled in, commit browsing url should not change
         self.github_project.commit_browsing_url = 'https://example.com/{commitid}'
         self.github_project.save()
-        self.assertEquals(self.github_project.commit_browsing_url,
+        self.assertEqual(self.github_project.commit_browsing_url,
                           'https://example.com/{commitid}')

codespeed/tests/test_settings.py

@@ -12,7 +12,7 @@ def setUp(self):
         self.cs_setting_keys = [key for key in dir(default_settings) if key.isupper()]
 
     def test_website_name(self):
-        """See if WEBSITENAME is set
+        """See if WEBSITE_NAME is set
         """
         self.assertTrue(default_settings.WEBSITE_NAME)
         self.assertEqual(default_settings.WEBSITE_NAME, 'MySpeedSite',