diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..2f78d350 --- /dev/null +++ b/.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 diff --git a/codespeed/commits/git.py b/codespeed/commits/git.py index 7b8f03e3..312ed1a2 100644 --- a/codespeed/commits/git.py +++ b/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({ diff --git a/codespeed/commits/tests/test_git.py b/codespeed/commits/tests/test_git.py index ad74b280..f6556655 100644 --- a/codespeed/commits/tests/test_git.py +++ b/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) diff --git a/codespeed/settings.py b/codespeed/settings.py index 37e2ac35..a2f932c8 100644 --- a/codespeed/settings.py +++ b/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 diff --git a/codespeed/tests/settings.py b/codespeed/tests/settings.py new file mode 100644 index 00000000..a9058c33 --- /dev/null +++ b/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' diff --git a/codespeed/tests/test_auth.py b/codespeed/tests/test_auth.py index 8e2868bc..bc2b356b 100644 --- a/codespeed/tests/test_auth.py +++ b/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 diff --git a/codespeed/tests/test_commits.py b/codespeed/tests/test_commits.py index 3c09d03e..12af1c57 100644 --- a/codespeed/tests/test_commits.py +++ b/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 diff --git a/codespeed/tests/test_models.py b/codespeed/tests/test_models.py index 5d116c73..eb1fc58d 100644 --- a/codespeed/tests/test_models.py +++ b/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}') diff --git a/codespeed/tests/test_settings.py b/codespeed/tests/test_settings.py index f525bd22..e621d50c 100644 --- a/codespeed/tests/test_settings.py +++ b/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', diff --git a/codespeed/tests/test_views.py b/codespeed/tests/test_views.py index c56132be..05453934 100644 --- a/codespeed/tests/test_views.py +++ b/codespeed/tests/test_views.py @@ -36,15 +36,15 @@ def test_add_correct_result(self): response = self.client.post(self.path, self.data) # Check that we get a success response - self.assertEquals(response.status_code, 202) - self.assertEquals(response.content.decode(), "Result data saved successfully") + self.assertEqual(response.status_code, 202) + self.assertEqual(response.content.decode(), "Result data saved successfully") # Check that the data was correctly saved e = Environment.objects.get(name='Dual Core') b = Benchmark.objects.get(name='float') - self.assertEquals(b.benchmark_type, "C") - self.assertEquals(b.units, "seconds") - self.assertEquals(b.lessisbetter, True) + self.assertEqual(b.benchmark_type, "C") + self.assertEqual(b.units, "seconds") + self.assertEqual(b.lessisbetter, True) p = Project.objects.get(name='MyProject') branch = Branch.objects.get(name='default', project=p) r = Revision.objects.get(commitid='23', branch=branch) @@ -68,15 +68,15 @@ def test_add_non_default_result(self): modified_data['max'] = 2 modified_data['min'] = 1.0 response = self.client.post(self.path, modified_data) - self.assertEquals(response.status_code, 202) - self.assertEquals(response.content.decode(), "Result data saved successfully") + self.assertEqual(response.status_code, 202) + self.assertEqual(response.content.decode(), "Result data saved successfully") e = Environment.objects.get(name='Dual Core') p = Project.objects.get(name='MyProject') branch = Branch.objects.get(name='default', project=p) r = Revision.objects.get(commitid='23', branch=branch) # Tweak the resolution down to avoid failing over very slight differences: - self.assertEquals(r.date, revision_date) + self.assertEqual(r.date, revision_date) i = Executable.objects.get(name='myexe O3 64bits') b = Benchmark.objects.get(name='float') @@ -86,18 +86,18 @@ def test_add_non_default_result(self): benchmark=b, environment=e ) - self.assertEquals(res.date, result_date) - self.assertEquals(res.std_dev, 1.11111) - self.assertEquals(res.val_max, 2) - self.assertEquals(res.val_min, 1) + self.assertEqual(res.date, result_date) + self.assertEqual(res.std_dev, 1.11111) + self.assertEqual(res.val_max, 2) + self.assertEqual(res.val_min, 1) def test_bad_environment(self): """Should return 400 when environment does not exist""" bad_name = '10 Core' self.data['environment'] = bad_name response = self.client.post(self.path, self.data) - self.assertEquals(response.status_code, 400) - self.assertEquals(response.content.decode(), + self.assertEqual(response.status_code, 400) + self.assertEqual(response.content.decode(), "Environment " + bad_name + " not found") self.data['environment'] = 'Dual Core' @@ -107,20 +107,20 @@ def test_empty_argument(self): backup = self.data[key] self.data[key] = "" response = self.client.post(self.path, self.data) - self.assertEquals(response.status_code, 400) - self.assertEquals( + self.assertEqual(response.status_code, 400) + self.assertEqual( response.content.decode(), 'Value for key "' + key + '" empty in request') self.data[key] = backup def test_missing_argument(self): """Should respond 400 when a POST request is missing an argument""" - for key in self.data: + for key in list(self.data): backup = self.data[key] del(self.data[key]) response = self.client.post(self.path, self.data) - self.assertEquals(response.status_code, 400) - self.assertEquals( + self.assertEqual(response.status_code, 400) + self.assertEqual( response.content.decode(), 'Key "' + key + '" missing from request') self.data[key] = backup @@ -130,7 +130,7 @@ def test_report_is_not_created(self): self.client.post(self.path, self.data) number_of_reports = len(Report.objects.all()) # After adding one result for one revision, there should be no reports - self.assertEquals(number_of_reports, 0) + self.assertEqual(number_of_reports, 0) def test_report_is_created(self): """Should create a report when adding a result for two revisions""" @@ -142,15 +142,14 @@ def test_report_is_created(self): # Second result should trigger report creation self.client.post(self.path, modified_data) number_of_reports = len(Report.objects.all()) - self.assertEquals(number_of_reports, 1) + self.assertEqual(number_of_reports, 1) def test_submit_data_with_none_timestamp(self): """Should add a default revision date when timestamp is None""" modified_data = copy.deepcopy(self.data) - # The value None will get urlencoded and converted to a "None" string - modified_data['revision_date'] = None + modified_data['revision_date'] = 'None' response = self.client.post(self.path, modified_data) - self.assertEquals(response.status_code, 202) + self.assertEqual(response.status_code, 202) def test_add_result_with_no_project(self): """Should add a revision with the project""" @@ -158,8 +157,8 @@ def test_add_result_with_no_project(self): modified_data['project'] = "My new project" modified_data['executable'] = "My new executable" response = self.client.post(self.path, modified_data) - self.assertEquals(response.status_code, 202) - self.assertEquals( + self.assertEqual(response.status_code, 202) + self.assertEqual( response.content.decode(), "Result data saved successfully") @@ -210,7 +209,7 @@ def test_get_returns_405(self): response = self.client.get(self.path, {'json': json.dumps(self.data)}) - self.assertEquals(response.status_code, 405) + self.assertEqual(response.status_code, 405) def test_add_correct_results(self): """Should add all results when the request data is valid""" @@ -218,16 +217,16 @@ def test_add_correct_results(self): {'json': json.dumps(self.data)}) # Check that we get a success response - self.assertEquals(response.status_code, 202) - self.assertEquals(response.content.decode(), + self.assertEqual(response.status_code, 202) + self.assertEqual(response.content.decode(), "All result data saved successfully") # Check that the data was correctly saved e = Environment.objects.get(name='bigdog') b = Benchmark.objects.get(name='Richards') - self.assertEquals(b.benchmark_type, "C") - self.assertEquals(b.units, "seconds") - self.assertEquals(b.lessisbetter, True) + self.assertEqual(b.benchmark_type, "C") + self.assertEqual(b.units, "seconds") + self.assertEqual(b.lessisbetter, True) p = Project.objects.get(name='pypy') branch = Branch.objects.get(name='default', project=p) r = Revision.objects.get(commitid='123', branch=branch) @@ -271,8 +270,8 @@ def test_bad_environment(self): response = self.client.post(self.path, {'json': json.dumps(self.data)}) - self.assertEquals(response.status_code, 400) - self.assertEquals( + self.assertEqual(response.status_code, 400) + self.assertEqual( response.content.decode(), "Environment " + bad_name + " not found") data['environment'] = 'bigdog' @@ -284,8 +283,8 @@ def test_empty_argument(self): data[key] = "" response = self.client.post(self.path, {'json': json.dumps(self.data)}) - self.assertEquals(response.status_code, 400) - self.assertEquals( + self.assertEqual(response.status_code, 400) + self.assertEqual( response.content.decode(), 'Value for key "' + key + '" empty in request') data[key] = backup @@ -293,13 +292,13 @@ def test_empty_argument(self): def test_missing_argument(self): '''Should return 400 when making a request with a missing argument''' data = self.data[2] - for key in data: + for key in list(data): backup = data[key] del(data[key]) response = self.client.post(self.path, {'json': json.dumps(self.data)}) - self.assertEquals(response.status_code, 400) - self.assertEquals( + self.assertEqual(response.status_code, 400) + self.assertEqual( response.content.decode(), 'Key "' + key + '" missing from request') data[key] = backup @@ -310,13 +309,13 @@ def test_report_is_created(self): {'json': json.dumps(self.data)}) # Check that we get a success response - self.assertEquals(response.status_code, 202) + self.assertEqual(response.status_code, 202) number_of_reports = len(Report.objects.all()) # After adding 4 result for 3 revisions, only 2 reports should be created # The third revision will need an extra result for Richards2 in order # to trigger report creation - self.assertEquals(number_of_reports, 1) + self.assertEqual(number_of_reports, 1) class TestTimeline(TestCase): @@ -326,19 +325,19 @@ def test_fixture(self): """Test the loaded fixture data """ env = Environment.objects.filter(name="Dual Core") - self.assertEquals(len(env), 1) + self.assertEqual(len(env), 1) benchmarks = Benchmark.objects.filter(name="float") - self.assertEquals(len(benchmarks), 1) - self.assertEquals(benchmarks[0].units, "seconds") + self.assertEqual(len(benchmarks), 1) + self.assertEqual(benchmarks[0].units, "seconds") results = benchmarks[0].results.all() - self.assertEquals(len(results), 8) + self.assertEqual(len(results), 8) def test_timeline(self): path = reverse('timeline') response = self.client.get(path) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) responsedata = response.content.decode() - self.assertIn('My Own Title\n: Timeline', responsedata) + self.assertIn("MyProject's Speed Center: Timeline", responsedata) def test_gettimelinedata(self): """Test that gettimelinedata returns correct timeline data @@ -352,26 +351,26 @@ def test_gettimelinedata(self): "revs": "2" } response = self.client.get(path, data) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) responsedata = json.loads(response.getvalue().decode()) - self.assertEquals( + self.assertEqual( responsedata['error'], "None", "there should be no errors") - self.assertEquals( + self.assertEqual( len(responsedata['timelines']), 1, "there should be 1 benchmark") - self.assertEquals( + self.assertEqual( len(responsedata['timelines'][0]['branches']), 2, "there should be 2 branches") - self.assertEquals( + self.assertEqual( len(responsedata['timelines'][0]['branches']['default']), 1, "there should be 1 timeline for master") - self.assertEquals( + self.assertEqual( len(responsedata['timelines'][0]['branches']['master']['1']), 2, "There are 2 datapoints") - self.assertEquals( + self.assertEqual( responsedata['timelines'][0]['branches']['master']['1'][1], [u'2011/04/13 17:04:22 ', 2000.0, 1.11111, u'2', u'', u'master'])