Merge lp:~fgallina/rnr-server/django16 into lp:rnr-server

[Fabián Ezequiel Gallina]

Upgrade to Django 1.6.5

[Matias Bordese (matiasb)]

LGTM

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~fgallina/rnr-server/django16 into lp:rnr-server failed. Below is the output from the failed tests.

[localhost] local: /usr/bin/python /usr/bin/virtualenv --no-site-packages virtualenv
The --no-site-packages flag is deprecated; it is now the default behavior.
New python executable in virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: virtualenv/bin/pip install -r requirements.txt
Downloading/unpacking http://corey-projects.googlecode.com/files/linux_metrics-0.1.0.tar.gz (from -r requirements.txt (line 9))
  Downloading linux_metrics-0.1.0.tar.gz
  Running setup.py egg_info for package from http://corey-projects.googlecode.com/files/linux_metrics-0.1.0.tar.gz

Downloading/unpacking bzr (from -r requirements.txt (line 5))
  Running setup.py egg_info for package bzr
    No Cython, trying Pyrex...

    The python package 'Pyrex' is not available. If the .c files are available,
    they will be built, but modifying the .pyx files will not rebuild them.

Downloading/unpacking coverage (from -r requirements.txt (line 6))
  Running setup.py egg_info for package coverage

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking django-pgtools==0.1 (from -r requirements.txt (line 7))
  Running setup.py egg_info for package django-pgtools

Downloading/unpacking django-factory==0.11 (from -r requirements.txt (line 8))
  Downloading django_factory-0.11.tar.gz
  Running setup.py egg_info for package django-factory

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking httplib2==0.6.0 (from -r requirements.txt (line 10))
  Running setup.py egg_info for package httplib2

Downloading/unpacking launchpadlib==1.9.12 (from -r requirements.txt (line 11))
  Running setup.py egg_info for package launchpadlib

Downloading/unpacking lazr.restfulclient==0.12.0 (from -r requirements.txt (line 12))
  Running setup.py egg_info for package lazr.restfulclient

Downloading/unpacking mechanize (from -r requirements.txt (line 13))
  Running setup.py egg_info for package mechanize

Downloading/unpacking mock (from -r requirements.txt (line 14))
  Running setup.py egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking oauthlib (from -r requirements.txt (line 15))
  Running setup.py egg_info for package oauthlib

Downloading/unpacking oops==0.0.13 (from -r requirements.txt (line 16))
  Downloading oops-0.0.13.tar.gz
  Running setup.py egg_info for package oops

Downloading/unpacking oops-datedir-repo==0.0.21 (from -r requirements.txt (line 17))
  Downloading oops_datedir_repo-0.0.21.tar.gz
...

[lp:~fgallina/rnr-server/django16]

263. By Fabián Ezequiel Gallina on 2014-07-25

Fixes for sqlite based test runs

=== modified file '.bzrignore'
--- .bzrignore	2014-07-11 19:05:55 +0000
+++ .bzrignore	2014-07-25 17:44:55 +0000
@@ -11,7 +11,12 @@
 django_project/rnrclient.py
 django_project/mockssoservice
 django_project/canonical
+django_project/configglue
+django_project/django
+django_project/django_openid_auth
+django_project/preflight
 django_project/piston
+django_project/south
 django_project/oops_dictconfig
 django_project/oops_wsgi
 django_project/adminaudit

=== modified file 'django_project/config_dev/config/main.cfg'
--- django_project/config_dev/config/main.cfg	2014-07-11 19:05:55 +0000
+++ django_project/config_dev/config/main.cfg	2014-07-25 17:44:55 +0000
@@ -64,8 +64,12 @@
 
 root_urlconf = urls
 
+session_serializer = django.contrib.sessions.serializers.PickleSerializer
+
 template_dirs = ./django_project/templates/
 
+test_runner = django.test.runner.DiscoverRunner
+
 installed_apps = adminaudit
     django.contrib.admin
     django.contrib.auth

=== modified file 'django_project/manage.py'
--- django_project/manage.py	2011-03-17 10:19:07 +0000
+++ django_project/manage.py	2014-07-25 17:44:55 +0000
@@ -1,17 +1,11 @@
 #!/usr/bin/env python
-
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in a directory on the path.
-except ImportError:
-    import sys
-    sys.stderr.write(
-        "Error: Can't find the file 'settings.py' within the "
-        "django_project. It appears you've customized things.\n"
-        "You'll have to run django-admin.py, passing it your "
-        "settings module.\n(If the file settings.py does indeed "
-        "exist, it's causing an ImportError somehow.)\n")
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)
+import os
+import sys
+
+
+if __name__ == '__main__':
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
+
+    from django_configglue.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2014-07-11 19:05:55 +0000
+++ fabtasks/bootstrap.py	2014-07-25 17:44:55 +0000
@@ -113,21 +113,44 @@
         "django_project/txstatsd")
 
     _get_or_pull_bzr_branch(
-        "lp:~ubuntuone-hackers/django-configglue/trunk",
-        "django-configglue")
+        "lp:~configglue/configglue/trunk", "configglue", revision=112)
+    _symlink("branches/configglue/configglue", "django_project/configglue")
+
+    _get_or_pull_bzr_branch(
+        "lp:django-configglue", "django-configglue", revision=79)
     _symlink(
         "branches/django-configglue/django_configglue",
         "django_project/django_configglue")
 
     _get_or_pull_bzr_branch(
+        "lp:~ubuntuone-pqm-team/django/stable", "django", revision="1.6.5")
+    _symlink("branches/django/django", "django_project/django")
+
+    _get_or_pull_bzr_branch(
+        "lp:~ubuntuone-pqm-team/django-openid-auth/stable",
+        "django-openid-auth", revision=104)
+    _symlink(
+        "branches/django-openid-auth/django_openid_auth",
+        "django_project/django_openid_auth")
+
+    _get_or_pull_bzr_branch(
+        "lp:~canonical-isd-hackers/django-preflight/trunk",
+        "django-preflight", revision=30)
+    _symlink("branches/django-preflight/preflight", "django_project/preflight")
+
+    _get_or_pull_bzr_branch(
         "lp:~ubuntuone-pqm-team/django-piston/stable",
         "django-piston",
-        revision=4)
+        revision=5)
     _symlink(
         "branches/django-piston/piston",
         "django_project/piston")
 
     _get_or_pull_bzr_branch(
+        "lp:~ubuntuone-hackers/django-south/trunk", "django-south", revision=5)
+    _symlink("branches/django-south/south", "django_project/south")
+
+    _get_or_pull_bzr_branch(
         "lp:~canonical-isd-hackers/django-adminaudit/trunk",
         "django-adminaudit",
         revision=53)

=== modified file 'requirements.txt'
--- requirements.txt	2014-07-22 12:32:55 +0000
+++ requirements.txt	2014-07-25 17:44:55 +0000
@@ -3,12 +3,8 @@
 -f http://code.google.com/p/httplib2/downloads/list
 -f https://launchpad.net/django-pgtools/+download
 bzr
-configglue==1.0.1
 coverage
-django-openid-auth==0.2
 django-pgtools==0.1
-django-preflight
-django==1.5.1
 django_factory==0.11
 http://corey-projects.googlecode.com/files/linux_metrics-0.1.0.tar.gz
 httplib2==0.6.0
@@ -25,7 +21,6 @@
 python-openid
 pytz
 setuptools
-south==0.7.6
 storm
 testtools
 wsgi_intercept==0.4

=== modified file 'src/clickreviews/tests/__init__.py'
--- src/clickreviews/tests/__init__.py	2014-06-23 20:12:52 +0000
+++ src/clickreviews/tests/__init__.py	2014-07-25 17:44:55 +0000
@@ -1,11 +0,0 @@
-from clickreviews.tests.test_utilities import VerifyPackageTestCase
-from clickreviews.tests.test_handlers import (
-    ClickReviewsHandlerGetTestCase,
-    ClickReviewsHandlerPostTestCase,
-    ClickReviewsStatsHandlerTestCase,
-)
-from clickreviews.tests.test_forms import ClickPackageReviewFormTestCase
-from clickreviews.tests.test_models import (
-    ClickPackageModelTestCase,
-    ClickPackageReviewModelTestCase,
-)

=== modified file 'src/clickreviews/tests/factory.py'
--- src/clickreviews/tests/factory.py	2014-06-24 11:10:39 +0000
+++ src/clickreviews/tests/factory.py	2014-07-25 17:44:55 +0000
@@ -40,7 +40,8 @@
     def makeClickPackageReview(
             self, reviewer=None, click_package=None, version=None, rating="5",
             summary=None, review_text=None, date_created=None, language=None,
-            hide=False, num_flags=0, architecture='i386', deleted=False):
+            hide=False, num_flags=0, architecture='i386',
+            usefulness_wilson_rating=None, deleted=False):
         if reviewer is None:
             reviewer = self.makeUser()
         if click_package is None:
@@ -60,6 +61,8 @@
             date_deleted = datetime.now(pytz.utc)
         else:
             date_deleted = None
+        if usefulness_wilson_rating is None:
+            usefulness_wilson_rating = 0.0
 
         architecture, created = Architecture.objects.get_or_create(
             tag=architecture)
@@ -69,7 +72,9 @@
             version=version, rating=rating, summary=summary,
             review_text=review_text, language=language,
             hide=hide, date_created=date_created,
-            architecture=architecture, date_deleted=date_deleted)
+            architecture=architecture,
+            usefulness_wilson_rating=usefulness_wilson_rating,
+            date_deleted=date_deleted)
 
         review.click_package.update_stats()
 

=== modified file 'src/clickreviews/tests/test_handlers.py'
--- src/clickreviews/tests/test_handlers.py	2014-07-03 17:57:21 +0000
+++ src/clickreviews/tests/test_handlers.py	2014-07-25 17:44:55 +0000
@@ -6,18 +6,16 @@
 from datetime import datetime
 from io import BytesIO
 
-from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.cache import cache
 from django.core.serializers.json import DateTimeAwareJSONEncoder
 from django.core.urlresolvers import reverse
-from django_factory import TestCase
 
 from clickreviews.models import ClickPackage, ClickPackageReview
 from clickreviews.tests.factory import TestCaseWithFactory
 
 
-class ClickReviewsHandlerPostTestCase(TestCase):
+class ClickReviewsHandlerPostTestCase(TestCaseWithFactory):
 
     def setUp(self):
         super(ClickReviewsHandlerPostTestCase, self).setUp()
@@ -38,6 +36,7 @@
 
     def make_data(self, package_name='com.ubuntu.dev.uname.pkgid',
                   rating=5):
+        self.factory.makeArch('i386')
         return {
             'package_name': package_name,
             'summary': 'Excellent',
@@ -51,9 +50,8 @@
     def _post_new_review(self, data, user=None, verify_result=True):
         # Post a review as an authenticated user.
         url = reverse('click-api-reviews')
-
         if user is None:
-            user = self.factory.make_one(User)
+            user = self.factory.makeUser()
         self.client.login(username=user.username, password='test')
 
         response = self.client.post(
@@ -125,19 +123,23 @@
         self.assertEqual(5, click_package.ratings_average)
 
 
-class ClickReviewsHandlerGetTestCase(TestCase):
+class ClickReviewsHandlerGetTestCase(TestCaseWithFactory):
 
     def _get_reviews(self, data=None):
         url = reverse('click-api-reviews')
         kwargs = {}
         if data is not None:
             kwargs['data'] = data
-        return self.client.get(url, **kwargs)
+        is_authenticated_method = (
+            'reviewsapp.auth.SSOOAuthAuthentication.is_authenticated')
+        with mock.patch(is_authenticated_method) as mock_is_authenticated:
+            mock_is_authenticated.return_value = False
+            return self.client.get(url, **kwargs)
 
     def test_get_multiple_reviews_for_package(self):
-        package = self.factory.make_one(ClickPackage)
-        reviews = self.factory.make(5, ClickPackageReview,
-                                    click_package=package)
+        package = self.factory.makeClickPackage()
+        for _ in range(5):
+            self.factory.makeClickPackageReview(click_package=package)
 
         json_result = self._get_reviews(data={
             'package_name': package.package_name,
@@ -148,10 +150,10 @@
         self.assertEqual(5, len(result))
 
     def test_get_reviews_contains_correct_data(self):
-        package = self.factory.make_one(ClickPackage,
-                                        package_name="com.example.me.myapp")
-        review = self.factory.make_one(
-            ClickPackageReview, click_package=package, language='en',
+        package = self.factory.makeClickPackage(
+            package_name="com.example.me.myapp")
+        review = self.factory.makeClickPackageReview(
+            click_package=package, language='en',
             rating=5, summary='Best app', review_text='Unlimited fun!',
             version='0.1.1', date_created=datetime(
                 2014, 1, 15, 11, 13, 55, 123456, tzinfo=pytz.UTC))
@@ -163,7 +165,7 @@
         result = json.loads(json_result.content)
         self.assertEqual(1, len(result))
         result_review = result[0]
-        testme = DateTimeAwareJSONEncoder().encode(
+        DateTimeAwareJSONEncoder().encode(
             review.date_created).strip('"')
         self.assertEqual({
             'id': review.id,
@@ -190,10 +192,10 @@
                          json.loads(result.content)['errors'].keys())
 
     def test_doesnt_include_deleted(self):
-        package = self.factory.make_one(ClickPackage)
-        review = self.factory.make_one(ClickPackageReview,
-                                       click_package=package,
-                                       date_deleted=datetime.now(pytz.UTC))
+        package = self.factory.makeClickPackage()
+        self.factory.makeClickPackageReview(
+            click_package=package,
+            deleted=True)
 
         json_result = self._get_reviews(data={
             'package_name': package.package_name,
@@ -203,11 +205,12 @@
         self.assertEqual(0, len(result))
 
     def test_ordered_by_wilson_rating(self):
-        package = self.factory.make_one(ClickPackage)
+        package = self.factory.makeClickPackage()
         wilson_ratings = [-1.5, 0, -2.5, 5.5]
         reviews = [
-            self.factory.make_one(ClickPackageReview, click_package=package,
-                                  usefulness_wilson_rating=wilson_rating)
+            self.factory.makeClickPackageReview(
+                click_package=package,
+                usefulness_wilson_rating=wilson_rating)
             for wilson_rating in wilson_ratings
         ]
         expected_review_ids = [
@@ -233,6 +236,29 @@
         super(ClickReviewsStatsHandlerTestCase, self).setUp()
         self.clear_cache()
 
+    def make_stats_response(
+            self, pk=1, package_name='org.some.package',
+            histogram='[0, 0, 0, 0, 1]', ratings_total=1,
+            ratings_average='5.00'):
+
+        # XXX: To be cleaned up once support for sqlite is dropped.
+        # Using sqlite does not honor the settings for the
+        # ratings_average DecimalField spec, ignoring max_digits and
+        # decimal_places when returning the formatted value.
+        db_engine = settings.DATABASES['default']['ENGINE']
+        if db_engine == 'django.db.backends.sqlite3':
+            ratings_average = ratings_average.rstrip('0')
+            if ratings_average.endswith('.'):
+                ratings_average = ratings_average[0:-1]
+
+        return {
+            'id': pk,
+            'package_name': package_name,
+            'histogram': histogram,
+            'ratings_total': ratings_total,
+            'ratings_average': ratings_average,
+        }
+
     def clear_cache(self):
         cache._cache.clear()
         cache._expire_info.clear()
@@ -260,19 +286,11 @@
         foo = foo_review.click_package
         bar = bar_review.click_package
         self.assertEqual(2, len(reviews))
-        self.assertEqual(reviews, [{
-            'id': foo.pk,
-            'package_name': foo.package_name,
-            'histogram': '[0, 0, 0, 0, 1]',
-            'ratings_total': 1,
-            'ratings_average': '5',
-        }, {
-            'id': bar.pk,
-            'package_name': bar.package_name,
-            'histogram': '[0, 0, 0, 0, 1]',
-            'ratings_total': 1,
-            'ratings_average': '5',
-        }])
+        self.assertEqual(reviews, [
+            self.make_stats_response(
+                pk=foo.pk, package_name=foo.package_name),
+            self.make_stats_response(
+                pk=bar.pk, package_name=bar.package_name)])
 
     def test_read_for_package(self):
         foo_review = self.factory.makeClickPackageReview(
@@ -286,13 +304,8 @@
         reviews = json.loads(response.content)
 
         foo = foo_review.click_package
-        self.assertEqual(reviews, {
-            'id': foo.pk,
-            'package_name': foo.package_name,
-            'histogram': '[0, 0, 0, 0, 1]',
-            'ratings_total': 1,
-            'ratings_average': '5',
-        })
+        self.assertEqual(reviews, self.make_stats_response(
+            pk=foo.pk, package_name=foo.package_name))
 
     def test_read_for_missing_package(self):
         response = self._request_stats(package_name='not_found')
@@ -343,19 +356,11 @@
 
         foo = foo_review.click_package
         bar = bar_review.click_package
-        self.assertEqual(reviews, [{
-            'id': foo.pk,
-            'package_name': foo.package_name,
-            'histogram': '[0, 0, 0, 0, 1]',
-            'ratings_total': 1,
-            'ratings_average': '5',
-        }, {
-            'id': bar.pk,
-            'package_name': bar.package_name,
-            'histogram': '[0, 0, 0, 0, 1]',
-            'ratings_total': 1,
-            'ratings_average': '5',
-        }])
+        self.assertEqual(reviews, [
+            self.make_stats_response(
+                pk=foo.pk, package_name=foo.package_name),
+            self.make_stats_response(
+                pk=bar.pk, package_name=bar.package_name)])
 
     def test_vary_headers(self):
         response = self._request_stats()

=== added file 'src/reviewsapp/migrations/0016_update_permissions.py'
--- src/reviewsapp/migrations/0016_update_permissions.py	1970-01-01 00:00:00 +0000
+++ src/reviewsapp/migrations/0016_update_permissions.py	2014-07-25 17:44:55 +0000
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+from django.contrib.auth.management import create_permissions
+from django.db import transaction
+from django.db.models import get_app, get_models
+from south.v2 import DataMigration
+
+
+class Migration(DataMigration):
+
+    def forwards(self, orm):
+        """Ensures that all Permission objects for models are up to date.
+
+        Given this is Django a version updgrade, and there's a South
+        bug[0] that won't let it track the permissions Meta for
+        models, we need to ensure all of them get synced correctly for
+        all installed apps.
+
+        [0] http://south.aeracode.org/ticket/211
+        """
+        models = get_models()
+        apps = [get_app(model._meta.app_label) for model in models]
+        for app in apps:
+            # Safeguard for sqlite.  See: http://bit.ly/1rRHC9Y
+            with transaction.autocommit():
+                create_permissions(app, models, verbosity=0)
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'reviewsapp.architecture': {
+            'Meta': {'object_name': 'Architecture'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tag': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '16'})
+        },
+        'reviewsapp.consumer': {
+            'Meta': {'object_name': 'Consumer'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'secret': ('django.db.models.fields.CharField', [], {'default': "'aVPDdxZfSorFGKwCrQKmArDJpMiQrq'", 'max_length': '255', 'blank': 'True'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'oauth_consumer'", 'unique': 'True', 'to': u"orm['auth.User']"})
+        },
+        'reviewsapp.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nonce': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Token']"})
+        },
+        'reviewsapp.repository': {
+            'Meta': {'object_name': 'Repository'},
+            'distroseries': ('django.db.models.fields.SlugField', [], {'max_length': '25'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100'})
+        },
+        'reviewsapp.review': {
+            'Meta': {'object_name': 'Review'},
+            'app_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'architecture': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Architecture']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'date_deleted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'hide': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.SlugField', [], {'max_length': '10'}),
+            'rating': ('reviewsapp.fields.IntegerRangeField', [], {}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'review_text': ('django.db.models.fields.CharField', [], {'max_length': '5000'}),
+            'reviewer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
+            'usefulness_favorable': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_percentage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'usefulness_wilson_rating': ('django.db.models.fields.FloatField', [], {'default': '0.0'}),
+            'version': ('reviewsapp.fields.DebVersionField', [], {'max_length': '100', 'db_index': 'True'})
+        },
+        'reviewsapp.reviewmoderation': {
+            'Meta': {'object_name': 'ReviewModeration'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'date_moderated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'moderator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'status': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.reviewmoderationflag': {
+            'Meta': {'ordering': "['-date_created']", 'object_name': 'ReviewModerationFlag'},
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review_moderation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.ReviewModeration']"}),
+            'summary': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True'})
+        },
+        'reviewsapp.rnrsettings': {
+            'Meta': {'object_name': 'RNRSettings'},
+            'blacklist_words': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'moderation_mode': ('django.db.models.fields.CharField', [], {'default': "'passive'", 'max_length': '8'})
+        },
+        'reviewsapp.softwareitem': {
+            'Meta': {'object_name': 'SoftwareItem'},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'histogram': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'package_name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'reviewsapp.softwareiteminorigin': {
+            'Meta': {'unique_together': "(('softwareitem', 'origin'),)", 'object_name': 'SoftwareItemInOrigin'},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'histogram': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'origin': ('django.db.models.fields.SlugField', [], {'max_length': '100'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.softwareiteminrepository': {
+            'Meta': {'unique_together': "(('softwareitem', 'repository'),)", 'object_name': 'SoftwareItemInRepository'},
+            'date_ratings_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2014, 7, 25, 0, 0)'}),
+            'histogram': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ratings_average': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '3', 'decimal_places': '2'}),
+            'ratings_total': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'repository': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Repository']"}),
+            'softwareitem': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.SoftwareItem']"})
+        },
+        'reviewsapp.token': {
+            'Meta': {'object_name': 'Token'},
+            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Consumer']"}),
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'default': "'TLaXclobaNdHsvKHbaNzyQOqCpmMIZxlDXxmFPXlgEWMTLQUCM'", 'max_length': '50', 'primary_key': 'True'}),
+            'token_secret': ('django.db.models.fields.CharField', [], {'default': "'JpBcFHPeJycAHuRJQFueAPjWmIirzaXhGkyULCemxhyTVHsqSc'", 'max_length': '50'}),
+            'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'reviewsapp.usefulness': {
+            'Meta': {'object_name': 'Usefulness'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'review': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reviewsapp.Review']"}),
+            'useful': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['reviewsapp']
+    symmetrical = True

=== modified file 'src/reviewsapp/models/reviews.py'
--- src/reviewsapp/models/reviews.py	2014-06-23 20:19:03 +0000
+++ src/reviewsapp/models/reviews.py	2014-07-25 17:44:55 +0000
@@ -445,7 +445,7 @@
 class Usefulness(models.Model):
     review = models.ForeignKey(Review, db_index=True)
     user = models.ForeignKey(User)
-    useful = models.BooleanField(db_index=True)
+    useful = models.BooleanField(db_index=True, default=False)
 
     def username(self):
         return self.user.username

=== modified file 'src/reviewsapp/preflight.py'
--- src/reviewsapp/preflight.py	2014-07-22 12:32:55 +0000
+++ src/reviewsapp/preflight.py	2014-07-25 17:44:55 +0000
@@ -27,9 +27,9 @@
 import launchpadlib
 import openid
 import piston.utils
+import preflight
 import south
 from django.conf import settings
-from preflight import Preflight, register
 
 import reviewsapp
 from reviewsapp.utilities import web_services
@@ -38,7 +38,7 @@
 logger = logging.getLogger(__name__)
 
 
-class RNRPreflight(Preflight):
+class RNRPreflight(preflight.Preflight):
 
     def versions(self):
         return [
@@ -47,6 +47,7 @@
             {'name': 'openid', 'version': openid.__version__},
             {'name': 'launchpadlib', 'version': launchpadlib.__version__},
             {'name': 'piston', 'version': piston.utils.__version__},
+            {'name': 'preflight', 'version': preflight.__version__},
             {'name': 'South', 'version': south.__version__},
         ]
 
@@ -102,4 +103,4 @@
         return type(pubs) == dict
 
 
-register(RNRPreflight)
+preflight.register(RNRPreflight)

=== modified file 'src/reviewsapp/schema.py'
--- src/reviewsapp/schema.py	2014-07-18 11:17:57 +0000
+++ src/reviewsapp/schema.py	2014-07-25 17:44:55 +0000
@@ -28,7 +28,7 @@
 from django_configglue.schema import schemas
 from oops_dictconfig.configglue_options import OopsOption
 
-DjangoSchema = schemas.get(django.get_version())
+DjangoSchema = schemas.get('1.6')
 
 
 class RnRSchema(DjangoSchema):

=== modified file 'src/reviewsapp/tests/__init__.py'
--- src/reviewsapp/tests/__init__.py	2012-10-22 14:18:20 +0000
+++ src/reviewsapp/tests/__init__.py	2014-07-25 17:44:55 +0000
@@ -1,37 +0,0 @@
-#   This file is part of Software Center Ratings and Reviews
-#   Copyright (C) 2010 Canonical Ltd.
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU Affero General Public License as
-#   published by the Free Software Foundation, either version 3 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU Affero General Public License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Pull in the different test cases so that Django's test runner finds them.
-
-Note: each module should define __all__ to ensure we're not importing more
-than intended.
-"""
-
-from __future__ import absolute_import
-
-from reviewsapp.tests.test_auth import *
-from reviewsapp.tests.test_command_populate import *
-from reviewsapp.tests.test_command_update_stats import *
-from reviewsapp.tests.test_decorators import *
-from reviewsapp.tests.test_handlers import *
-from reviewsapp.tests.test_middleware import *
-from reviewsapp.tests.test_models import *
-from reviewsapp.tests.test_rnrclient import *
-from reviewsapp.tests.test_preflight import *
-from reviewsapp.tests.test_utilities import *
-from reviewsapp.tests.test_views import *
-from reviewsapp.tests.test_wsgi import *
-from reviewsapp.tests.test_pep8 import *

=== modified file 'src/reviewsapp/tests/factory.py'
--- src/reviewsapp/tests/factory.py	2014-07-16 16:02:40 +0000
+++ src/reviewsapp/tests/factory.py	2014-07-25 17:44:55 +0000
@@ -81,6 +81,10 @@
             prefix = "generic-string"
         return prefix + str(self.getUniqueInteger())
 
+    def makeArch(self, tag='i386'):
+        """Gets or create an Arch with provided tag."""
+        return Architecture.objects.get_or_create(tag=tag)
+
     def makeOAuthTokenAndConsumer(
             self, user=None, consumer_secret=None, token_string=None,
             token_secret=None, save=True):

=== modified file 'src/reviewsapp/tests/helpers.py'
--- src/reviewsapp/tests/helpers.py	2014-06-23 20:19:03 +0000
+++ src/reviewsapp/tests/helpers.py	2014-07-25 17:44:55 +0000
@@ -27,15 +27,39 @@
 from contextlib import contextmanager
 from unittest import TestCase
 
+from django.db import (
+    close_connection,
+    close_old_connections,
+    connection,
+)
 from django.conf import settings
+from django.core import signals
 from wsgi_intercept import add_wsgi_intercept, remove_wsgi_intercept
 from wsgi_intercept.httplib2_intercept import install, uninstall
+from wsgi_intercept.urllib2_intercept import install_opener, uninstall_opener
 
 
 class WSGIInterceptedTestCase(TestCase):
-    def setUp(self, callbacks):
+    def setUp(self, callbacks=None):
         super(WSGIInterceptedTestCase, self).setUp()
+        if callbacks is None:
+            callbacks = {}
+
+        # Django 1.6 changed the way db connections are managed in the
+        # request cycle, now it cleans up connections at request start
+        # and end by detecting if the are usable or not.  Because the
+        # current connection in tests generates outside of the patched
+        # wsgi request, such connections are closed and therefore
+        # tests fail. This code prevents that:
+        signals.request_started.disconnect(close_old_connections)
+        signals.request_finished.disconnect(close_old_connections)
+        self.addCleanup(
+            signals.request_started.connect, close_old_connections)
+        self.addCleanup(
+            signals.request_finished.connect, close_old_connections)
+
         self.intercepted = []
+        install_opener()
         install()
 
         for key, callback in callbacks.items():
@@ -48,6 +72,7 @@
     def tearDown(self):
         for host, port in self.intercepted:
             remove_wsgi_intercept(host, port)
+        uninstall_opener()
         uninstall()
         super(WSGIInterceptedTestCase, self).tearDown()
 

=== modified file 'src/reviewsapp/tests/test_handlers.py'
--- src/reviewsapp/tests/test_handlers.py	2014-07-03 17:57:21 +0000
+++ src/reviewsapp/tests/test_handlers.py	2014-07-25 17:44:55 +0000
@@ -888,7 +888,9 @@
 
 
 class SubmitReviewHandlerTestCase(TestCaseWithFactory):
+
     def setUp(self):
+        super(SubmitReviewHandlerTestCase, self).setUp()
         self.required_data = {
             'package_name': 'inkscape',
             'summary': 'Excellent',
@@ -900,7 +902,7 @@
             'language': 'en',
             'arch_tag': 'i386',
         }
-        super(SubmitReviewHandlerTestCase, self).setUp()
+        self.factory.makeArch('i386')
 
     def _post_new_review(self, data, user=None, verify_result=True):
         # Post a review as an authenticated user.

=== modified file 'src/reviewsapp/tests/test_middleware.py'
--- src/reviewsapp/tests/test_middleware.py	2014-01-03 15:37:31 +0000
+++ src/reviewsapp/tests/test_middleware.py	2014-07-25 17:44:55 +0000
@@ -88,27 +88,3 @@
 
         key = '.exceptions.ZeroDivisionError'
         self.assert_stat_sent(key, mock_send)
-
-
-class SoftTimeoutMiddlewareTestCase(TestCase):
-    @patch('django.test.client.RequestFactory._base_environ')
-    def test_delay_triggers_oops_report(self, mock_environ):
-        environ = {
-            'REQUEST_METHOD': 'GET',
-            'SERVER_NAME': 'testserver',
-            'SERVER_PORT': '80',
-            'wsgi.input': ''
-        }
-
-        def get_environ(**request):
-            environ.update(request)
-            return environ
-        mock_environ.side_effect = get_environ
-        # soft_request_timeout is an IntConfigOption, but a float works too
-        with patch_settings(ENABLE_ARTIFICIAL_OOPS=True,
-                            SOFT_REQUEST_TIMEOUT=0.1):
-            reload(reviewsapp.urls)
-            self.client.get('/reviews/delay/0.1/')
-
-        reload(reviewsapp.urls)
-        self.assertTrue('dump-oops' in environ)

=== modified file 'src/reviewsapp/tests/test_wsgi.py'
--- src/reviewsapp/tests/test_wsgi.py	2014-01-03 15:53:10 +0000
+++ src/reviewsapp/tests/test_wsgi.py	2014-07-25 17:44:55 +0000
@@ -97,3 +97,14 @@
         self.assertEqual(oops.get('type'), 'ZeroDivisionError')
         self.assertIn('tb_text', oops)
         self.assertTrue(oops['tb_text'].startswith('  File '))
+
+    def test_delay_triggers_an_oops(self):
+        self.environ['PATH_INFO'] = '/reviews/delay/0.1/'
+
+        with patch_settings(SOFT_TIMEOUT_MILLISECONDS=1):
+            self.request_wsgi_response(self.environ)
+
+        oops_content = self.read_oops_from_disk()
+        self.assertEqual('SoftRequestTimeout', oops_content['type'])
+        expected = u'Start_response over timeout 1.'
+        self.assertEqual(expected, oops_content['value'])