Merge lp:~jml/canonical-identity-provider/trivial-good into lp:canonical-identity-provider/release

Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 552
Proposed branch: lp:~jml/canonical-identity-provider/trivial-good
Merge into: lp:canonical-identity-provider/release
Diff against target: 9 lines (+1/-1)
1 file modified
README (+1/-1)
To merge this branch: bzr merge lp:~jml/canonical-identity-provider/trivial-good
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Canonical ISD hackers Pending
Review via email: mp+139467@code.launchpad.net

Commit message

Trivial change to README to test new testing infrastructure

Description of the change

As I said, a trivial good change to test out pre-merge testing.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (3.4 KiB)

The attempt to merge lp:~jml/canonical-identity-provider/trivial-good into lp:canonical-identity-provider failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
[localhost] local: . /tmp/tmpIiNvtY/.env/bin/activate && python django_project/manage.py test --noinput

WARNING:root:File /tmp/tmpIiNvtY/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpIiNvtY/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpIiNvtY/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpIiNvtY/django_project/config/config/devel.cfg could not be read. Skipping.
Traceback (most recent call last):
  File "django_project/manage.py", line 11, in <module>
    execute_manager(settings)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 438, in execute_manager
    utility.execute()
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django_configglue/management/__init__.py", line 71, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/test/simple.py", line 296, in setup_databases
    test_db_name = connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/db/backends/creation.py", line 351, in create_test_db
    self._create_test_db(verbosity, autoclobber)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/db/backends/creation.py", line 415, in _create_test_db
    cursor = self.connection.cursor()
  File "/tmp/tmpIiNvtY/identityprovider/backend/old/base.py", line 25, in cursor
    cursor = super(DatabaseWrapper, self).cursor()
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/db/backends/__init__.py", line 252, in cursor
    cursor = util.CursorWrapper(self._cursor(), self)
  File "/tmp/tmpIiNvtY/identityprovider/backend/base.py", line 179, in _cursor
    cursor = super(DatabaseWrapper, self)._cursor(*args)
  File "/tmp/tmpIiNvtY/identityprovider/backend/old/base.py", line 15, in _cursor
    cursor = super(DatabaseWrapper, self)._cursor(*args)
  File "/tmp/tmpIiNvtY/.env/local/lib/python2.7/site-packages/django/db/backends/postgresql_psycopg2/base.py", line 140, in _cursor
    self.connection = Database.connect(**conn_params)
psycopg2.OperationalError: could not connect to serv...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-10-30 08:01:46 +0000
3+++ README 2012-12-12 13:58:21 +0000
4@@ -227,4 +227,4 @@
5 Enjoy!
6 ------
7
8-We hope you enjoy using this software.
9+We hope you really enjoy using this software.