Canonical SSO provider

Merge lp://qastaging/~jml/canonical-identity-provider/timeout-experiments into lp://qastaging/canonical-identity-provider/release

timeout-experiments
Merge into trunk

Proposed by Jonathan Lange on 2012-12-12

Status:	Merged
Approved by:	Jonathan Lange on 2012-12-12
Approved revision:	no longer in the source branch.
Merged at revision:	553
Proposed branch:	lp://qastaging/~jml/canonical-identity-provider/timeout-experiments
Merge into:	lp://qastaging/canonical-identity-provider/release
Diff against target:	21 lines (+4/-0) 2 files modified .bzrignore (+1/-0) tarmac_tests.sh (+3/-0)
To merge this branch:	bzr merge lp://qastaging/~jml/canonical-identity-provider/timeout-experiments
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Canonical ISD hackers		2012-12-12	Pending
Review via email: mp+139490@code.qastaging.launchpad.net

Commit message

Set up fixture data before running tarmac tests

Description of the change

Trying this to see what happens.

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-12-12:

No approved revision specified.

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-12-12:

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

WARNING:root:File /tmp/tmptIkRAJ/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmptIkRAJ/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmptIkRAJ/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmptIkRAJ/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmptIkRAJ/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmptIkRAJ/django_project/config/config/devel.cfg could not be read. Skipping.
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/fabric/main.py", line 717, in main
    *args, **kwargs
  File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 332, in execute
    results['<local-only>'] = task.run(*args, **new_kwargs)
  File "/usr/local/lib/python2.7/dist-packages/fabric/tasks.py", line 112, in run
    return self.wrapped(*args, **kwargs)
TypeError: manage() takes at least 1 argument (0 given)

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-12-12:

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

[localhost] local: . /tmp/tmpHd3wgK/.env/bin/activate && python django_project/manage.py loaddata:test

WARNING:root:File /tmp/tmpHd3wgK/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpHd3wgK/django_project/config/config/devel.cfg could not be read. Skipping.
Unknown command: 'loaddata:test'
Type 'manage.py help' for usage.

Fatal error: local() encountered an error (return code 1) while executing '. /tmp/tmpHd3wgK/.env/bin/activate && python django_project/manage.py loaddata:test '

Aborting.

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-12-12:

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

Installed 38 object(s) from 1 fixture(s)
[localhost] local: . /tmp/tmpDs0oke/.env/bin/activate && python django_project/manage.py loaddata test

Done.

WARNING:root:File /tmp/tmpDs0oke/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/config/config/devel.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /tmp/tmpDs0oke/django_project/config/config/devel.cfg could not be read. Skipping.
./tarmac_tests.sh: 18: ./tarmac_tests.sh: Syntax error: "(" unexpected