Align repo files and test settings with speed.python.org

Author: StanFromIreland

.gitignore

@@ -4,9 +4,13 @@
 .DS_Store
 *.db
 sample_project/repos/*
+speed_python/repos/*
 speed_pypy/repos/*
+speed_python/sitestatic/*
+speed_python/secret_key
 override
 build
 dist
-codespeed.egg-info/
-
+*.egg-info
+.venv*/
+speed_python/local_settings.py

README.md

@@ -50,6 +50,12 @@ The codespeed installation can now be accessed by navigating to `http://localhos
 modify `sample_project/settings.py` and set `DEBUG = False`.
 [`sample_project/README.md`](https://github.com/tobami/codespeed/tree/master/sample_project/README.md) also describes some production settings.
 
+### Running the tests
+
+The test suite uses its own site-independent settings module:
+
+        python manage.py test codespeed --settings=codespeed.tests.settings
+
 ## Codespeed configuration
 
 ### Using the provided test data

codespeed/tests/settings.py

@@ -1,5 +1,20 @@
+"""Django settings for running the Codespeed test suite.
+
+Site independent: no site package is involved, so the suite exercises the
+``codespeed`` app on its own. Site packages such as ``speed_pypy`` run their
+tests under these settings too and override what they need per test case.
+
+Usage::
+
+    python manage.py test codespeed --settings=codespeed.tests.settings
+"""
 import os
-from codespeed.settings import *
+
+from codespeed.settings import *  # noqa: F401,F403
+
+TESTS_DIR = os.path.dirname(os.path.abspath(__file__))
+
+DEBUG = False
 
 DATABASES = {
     'default': {
@@ -10,8 +25,9 @@
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 SECRET_KEY = 'test-secret-key-not-for-production'
-USE_TZ = False
+USE_TZ = True
 TIME_ZONE = 'UTC'
+USE_I18N = False
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -31,12 +47,13 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'speed_pypy.urls'
+ROOT_URLCONF = 'codespeed.urls'
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        # Site-style template overrides the tests check for
+        'DIRS': [os.path.join(TESTS_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -50,4 +67,10 @@
 ]
 
 STATIC_URL = '/static/'
+
+# Codespeed clones repositories here when commit logs are requested.
 REPOSITORY_BASE_PATH = '/tmp/codespeed-test-repos'
+
+CACHES = {
+    'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
+}

codespeed/tests/templates/codespeed/base_site.html

@@ -0,0 +1,6 @@
+{% extends "codespeed/base.html" %}
+
+{# Site-level override, used to verify that a site can customise the title #}
+{% block title %}
+	My Own Title
+{% endblock %}

codespeed/tests/test_views.py

@@ -5,6 +5,7 @@
 
 from django.test import TestCase, override_settings
 from django.urls import reverse
+from django.utils import timezone
 
 from codespeed.models import (Project, Benchmark, Revision, Branch, Executable,
                               Environment, Result, Report)
@@ -77,7 +78,7 @@ def test_add_non_default_result(self):
         r = Revision.objects.get(commitid='23', branch=branch)
 
         # Tweak the resolution down to avoid failing over very slight differences:
-        self.assertEqual(r.date, revision_date)
+        self.assertEqual(r.date, timezone.make_aware(revision_date))
 
         i = Executable.objects.get(name='myexe O3 64bits')
         b = Benchmark.objects.get(name='float')
@@ -87,7 +88,7 @@ def test_add_non_default_result(self):
             benchmark=b,
             environment=e
         )
-        self.assertEqual(res.date, result_date)
+        self.assertEqual(res.date, timezone.make_aware(result_date))
         self.assertEqual(res.std_dev, 1.11111)
         self.assertEqual(res.val_max, 2)
         self.assertEqual(res.val_min, 1)
@@ -408,7 +409,7 @@ def test_timeline(self):
         response = self.client.get(path)
         self.assertEqual(response.status_code, 200)
         responsedata = response.content.decode()
-        self.assertIn("MyProject's Speed Center: Timeline", responsedata)
+        self.assertIn('My Own Title\n: Timeline', responsedata)
 
     def test_gettimelinedata(self):
         """Test that gettimelinedata returns correct timeline data
@@ -443,7 +444,7 @@ def test_gettimelinedata(self):
             "There are 2 datapoints")
         self.assertEqual(
             responsedata['timelines'][0]['branches']['master']['1:1'][1],
-            [u'2011/04/13 17:04:22 ', 2000.0, 1.11111, u'2', u'', u'master', u''])
+            [u'2011/04/13 17:04:22 +0000', 2000.0, 1.11111, u'2', u'', u'master', u''])
 
 
 @override_settings(ALLOW_ANONYMOUS_POST=True)

manage.py

@@ -5,5 +5,5 @@
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "speed_pypy.settings")
 
     from django.core.management import execute_from_command_line
-    execute_from_command_line(sys.argv)
 
+    execute_from_command_line(sys.argv)

setup.py

@@ -10,7 +10,7 @@
     license='GNU Lesser General Public License version 2.1',
     keywords=['benchmarking', 'visualization'],
     install_requires=['django', 'isodate', 'matplotlib'],
-    packages=find_packages(exclude=['ez_setup', 'sample_project']),
+    packages=find_packages(exclude=['ez_setup', 'sample_project', 'speed_python', 'speed_pypy']),
     long_description='README.md',
     long_description_content_type="text/markdown",
     description='A web application to monitor and analyze the performance of your code',
@@ -32,4 +32,3 @@
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
     ]
 )
-