Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-functional-tests into lp:canonical-identity-provider/release

Proposed by Ricardo Kirkner
Status: Merged
Approved by: David Owen
Approved revision: no longer in the source branch.
Merged at revision: 136
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/fix-functional-tests
Merge into: lp:canonical-identity-provider/release
Diff against target: 38 lines (+9/-1)
2 files modified
identityprovider/fixtures/test.json (+5/-0)
payload/__init__.py (+4/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-functional-tests
Reviewer Review Type Date Requested Status
David Owen (community) Approve
Review via email: mp+52600@code.launchpad.net

Commit message

fixed failing functional tests

Description of the change

fixed failing functional tests

To post a comment you must log in.
Revision history for this message
David Owen (dsowen) wrote :

Looks good, and tests pass locally. Let's see what the tools formerly known as Hudson thinks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'identityprovider/fixtures/test.json'
2--- identityprovider/fixtures/test.json 2010-12-20 17:48:56 +0000
3+++ identityprovider/fixtures/test.json 2011-03-08 19:31:28 +0000
4@@ -278,6 +278,11 @@
5 "lp_account": 12
6 }
7 },
8+ {
9+ "pk": "name12_oid",
10+ "model": "identityprovider.lpopenididentifier",
11+ "fields": {"lp_account": 12, "date_created": "2005-06-06 08:59:51"}
12+ },
13 {
14 "pk": 66,
15 "model": "identityprovider.person",
16
17=== modified file 'payload/__init__.py'
18--- payload/__init__.py 2011-03-07 18:04:15 +0000
19+++ payload/__init__.py 2011-03-08 19:31:28 +0000
20@@ -83,6 +83,8 @@
21 """Run the tests for hudson."""
22 bootstrap(hudson=True)
23 resetdb()
24+ # the functional tests depend on some data found in the fixtures
25+ virtualenv('python django_project/manage.py loaddata test')
26 test(functional=True, coverage=True)
27
28
29@@ -144,7 +146,8 @@
30 with cd('django_project'):
31 local("bzr branch %s .config" % CONFIG_BRANCH, capture=False)
32
33- _create_local_cfg()
34+ if not os.path.exists('django_project/local.cfg'):
35+ _create_local_cfg()
36
37
38 def _create_local_cfg():