Canonical SSO provider

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

  1. timeout-experiments
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 553
Proposed branch: lp:~jml/canonical-identity-provider/timeout-experiments
Merge into: lp: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:~jml/canonical-identity-provider/timeout-experiments
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+139490@code.launchpad.net

Commit message

Set up fixture data before running tarmac tests

Description of the change

Trying this to see what happens.

To post a comment you must log in.
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

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 :

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 :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-12-06 10:45:19 +0000
3+++ .bzrignore 2012-12-12 16:06:19 +0000
4@@ -24,3 +24,4 @@
5 results
6 docs/html
7 docs/html/*
8+log
9
10=== modified file 'tarmac_tests.sh'
11--- tarmac_tests.sh 2012-12-12 14:41:28 +0000
12+++ tarmac_tests.sh 2012-12-12 16:06:19 +0000
13@@ -13,5 +13,8 @@
14 sed -i 's/db_host = .*/db_host =/g' django_project/local.cfg
15 fab resetdb >> $LOG_FILE
16
17+# The functional tests depend on some data found in the fixtures.
18+fab manage:"loaddata test"
19+
20 # run tests
21 fab test