Merge lp:~canonical-isd-hackers/canonical-identity-provider/hudson into lp:canonical-identity-provider/release

[Ricardo Kirkner]

added better hudson support

This branch adds some changes to make hudson integration easier

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'fabfile.py'
--- fabfile.py	2011-03-04 18:16:47 +0000
+++ fabfile.py	2011-03-04 20:07:39 +0000
@@ -1,2 +1,5 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
 # use a payload package to keep fabric code organized
 from payload import *

=== modified file 'payload/__init__.py'
--- payload/__init__.py	2011-03-04 18:16:47 +0000
+++ payload/__init__.py	2011-03-04 20:07:39 +0000
@@ -12,6 +12,9 @@
 from .virtualenv import *
 from .postgresql import *
 
+# make sure the virtualenv is automatically activated
+setup_virtualenv()
+
 
 # constants
 # =========
@@ -49,18 +52,33 @@
 
 def clean_coverage():
     """Remove coverage report files."""
-    local("rm -rf .coverage coverage.d coverage.xml")
+    with cd('django_project'):
+        local("rm -rf .coverage coverage.d coverage.xml")
 
 
 # development
-def test(functional=False):
-    """Run whole test suite."""
-    cmd = ['cd django_project &&', 'nosetests --with-django identityprovider']
+def test(functional=False, coverage=False, hudson=False):
+    """Run the test suite."""
+    cmd = ['cd django_project &&',
+           'PYTHONPATH=. nosetests --with-django identityprovider']
     if not functional:
         cmd.append("--eval-attr='not functional'")
+    if coverage or hudson:
+        cmd.append('--with-coverage --cover-package=identityprovider')
+    if hudson:
+        # add support for cobertura
+        cmd.append('--with-xcoverage')
+        cmd.append('--with-xunit')
     virtualenv(' '.join(cmd), capture=False)
 
 
+def hudson():
+    """Run the tests for hudson."""
+    bootstrap()
+    resetdb()
+    test(functional=True, coverage=True, hudson=True)
+
+
 def run():
     """Run development server using whole WSGI stack."""
     virtualenv('python wsgiserver.py', capture=False)

=== modified file 'requirements.txt'
--- requirements.txt	2011-03-03 13:57:50 +0000
+++ requirements.txt	2011-03-04 20:07:39 +0000
@@ -55,7 +55,8 @@
 # testing dependencies
 BeautifulSoup==3.1.0.1
 NoseDjango==0.8.1
-coverage==2.85
+nosexcover
+coverage<3.4
 mock==0.6.0
 wsgiref==0.1.2
 lazr.restfulclient==0.9.11