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

[Ricardo Kirkner]

fixed failing functional tests

fixed failing functional tests

[David Owen (dsowen)]

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

review: Approve

=== modified file 'identityprovider/fixtures/test.json'
--- identityprovider/fixtures/test.json	2010-12-20 17:48:56 +0000
+++ identityprovider/fixtures/test.json	2011-03-08 19:31:28 +0000
@@ -278,6 +278,11 @@
             "lp_account": 12
         }
     },
+	{
+        "pk": "name12_oid",
+        "model": "identityprovider.lpopenididentifier",
+        "fields": {"lp_account": 12, "date_created": "2005-06-06 08:59:51"}
+	},
     {
         "pk": 66,
         "model": "identityprovider.person",
 
=== modified file 'payload/__init__.py'
--- payload/__init__.py	2011-03-07 18:04:15 +0000
+++ payload/__init__.py	2011-03-08 19:31:28 +0000
@@ -83,6 +83,8 @@
     """Run the tests for hudson."""
     bootstrap(hudson=True)
     resetdb()
+    # the functional tests depend on some data found in the fixtures
+    virtualenv('python django_project/manage.py loaddata test')
     test(functional=True, coverage=True)
 
 
@@ -144,7 +146,8 @@
         with cd('django_project'):
             local("bzr branch %s .config" % CONFIG_BRANCH, capture=False)
 
-    _create_local_cfg()
+    if not os.path.exists('django_project/local.cfg'):
+        _create_local_cfg()
 
 
 def _create_local_cfg():