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

[David Owen]

Adds some recent features to the mock API server, and improves the suite's determinism.

Added a missing part of the mocked API.

Made the test runner wait properly for WSGI shutdown (avoids some port 80 already in use errors).

Don't rely on getting certain IDs for new objects. We now have Django do transaction-rollbacks between tests (as opposed to dropping and recreating everything), but DB sequence changes survive rollbacks (by design).

[Ricardo Kirkner (ricardokirkner)]

Changes look alright, and all tests pass. Good work!

review: Approve

[Łukasz Czyżykowski (lukasz-czyzykowski)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'doctests/stories/api-workflows.txt'
--- doctests/stories/api-workflows.txt	2010-12-14 16:52:42 +0000
+++ doctests/stories/api-workflows.txt	2011-01-03 20:45:27 +0000
@@ -308,7 +308,8 @@
 Retrive Account Information By Email Address Associated To It
 -------------------------------------------------------------
 
-    >>> api.authentications.account_by_email(email="[e-mail]")
+    >>> account = api.authentications.account_by_email(email="[e-mail]")
+    >>> account
     {u'username': ..., u'preferred_email': u'[e-mail]', u'displayname': ..., u'unverified_emails': [], u'verified_emails': [], u'openid_identifier': ...}
 
     >>> r = api.authentications.account_by_email(email="[e-mail]")
@@ -318,8 +319,9 @@
 Retrive Account Information By OpenID Identifier Associated To It
 -------------------------------------------------------------
 
-    >>> api.authentications.account_by_openid(openid="openid_identifier")
-    {u'username': ..., u'preferred_email': u'[e-mail]', u'displayname': ..., u'unverified_emails': [], u'verified_emails': [], u'openid_identifier': u'openid_identifier)}
+    >>> api.authentications.account_by_openid(
+    ...     openid=account['openid_identifier'])
+    {u'username': ..., u'preferred_email': u'[e-mail]', u'displayname': ..., u'unverified_emails': [], u'verified_emails': [], u'openid_identifier': ...}
 
     >>> r = api.authentications.account_by_openid(openid="bad-openid")
     >>> r is None

=== modified file 'identityprovider/tests/test_admin.py'
--- identityprovider/tests/test_admin.py	2010-12-13 13:48:18 +0000
+++ identityprovider/tests/test_admin.py	2011-01-03 20:45:27 +0000
@@ -34,18 +34,31 @@
         for model in (AccountPassword, Person, LPOpenIdIdentifier):
             self.assertRaises(NotRegistered, admin.site.unregister, model)
 
-    def test_openidrpconfig_allowed_sreg_checkboxes(self):
+    def test_openidrpconfig_allowed_sreg_checkboxes_postable(self):
+        data = {'trust_root': 'http://localhost/bla/',
+                'displayname': 'My Test RP',
+                'description': 'Bla',
+                'allowed_sreg': 'fullname',
+                'creation_rationale': '13',
+                }
         response = self.client.get('/admin/identityprovider/openidrpconfig/add/')
-        data = {'trust_root': 'http://localhost/bla/',
-                'displayname': 'My Test RP',
-                'description': 'Bla',
-                'allowed_sreg': 'fullname',
-                'creation_rationale': '13',
-                }
         response = self.client.post('/admin/identityprovider/openidrpconfig/add/',
             data)
         self.assertEquals(302, response.status_code)
-        response = self.client.get('/admin/identityprovider/openidrpconfig/1/')
+        # We don't get the ID back, so continue on to the next test to
+        # verify that the checkbox appears on the model's screen.
+
+    def test_openidrpconfig_allowed_sreg_checkboxes_getable(self):
+        data = {'trust_root': 'http://localhost/bla/',
+                'displayname': 'My Test RP',
+                'description': 'Bla',
+                'allowed_sreg': 'fullname',
+                'creation_rationale': '13',
+                }
+        rpconfig = OpenIDRPConfig(**data)
+        rpconfig.save()
+        response = self.client.get('/admin/identityprovider/openidrpconfig/%s/'
+                                   % rpconfig.id)
         self.assertContains(response, 'checked')
 
     def test_inline_models(self):

=== modified file 'mockservice/sso_mockserver/mockserver.py'
--- mockservice/sso_mockserver/mockserver.py	2010-09-14 23:37:14 +0000
+++ mockservice/sso_mockserver/mockserver.py	2011-01-03 20:45:27 +0000
@@ -261,6 +261,12 @@
                         return self.jsons('verified_accounts')
                     else:
                         return self.jsons(json='null')
+                elif op == 'account_by_openid':
+                    openid = form['openid']
+                    if openid == 'openid_identifier':
+                        return self.jsons('verified_accounts')
+                    else:
+                        return self.jsons(json='null')
 
         elif self.environ['REQUEST_METHOD'].lower() == 'post':
             clength = int(self.environ['CONTENT_LENGTH'])

=== modified file 'mockservice/sso_mockserver/wadl.xml'
--- mockservice/sso_mockserver/wadl.xml	2010-08-11 18:14:58 +0000
+++ mockservice/sso_mockserver/wadl.xml	2011-01-03 20:45:27 +0000
@@ -31,41 +31,41 @@
   <!--The JSON representation of a "service root" resource contains a
       number of links to collection-type resources.-->
   <wadl:representation mediaType="application/json" id="service-root-json">
-
+    
       <wadl:param style="plain"
                   path="$['registrations_collection_link']"
                   name="registrations_collection_link">
         <wadl:link resource_type="@@SERVICE_ROOT@@/#registrations"/>
       </wadl:param>
-
-
+    
+    
       <wadl:param style="plain"
                   path="$['authentications_collection_link']"
                   name="authentications_collection_link">
         <wadl:link resource_type="@@SERVICE_ROOT@@/#authentications"/>
       </wadl:param>
-
-
+    
+    
       <wadl:param style="plain"
                   path="$['captchas_collection_link']"
                   name="captchas_collection_link">
         <wadl:link resource_type="@@SERVICE_ROOT@@/#captchas"/>
       </wadl:param>
-
-
+    
+    
       <wadl:param style="plain"
                   path="$['accounts_collection_link']"
                   name="accounts_collection_link">
         <wadl:link resource_type="@@SERVICE_ROOT@@/#accounts"/>
       </wadl:param>
-
-
+    
+    
       <wadl:param style="plain"
                   path="$['validations_collection_link']"
                   name="validations_collection_link">
         <wadl:link resource_type="@@SERVICE_ROOT@@/#accounts"/>
       </wadl:param>
-
+    
     <wadl:param style="plain" name="resource_type_link" path="$['resource_type_link']">
       <wadl:doc>The link to the WADL description of this resource.</wadl:doc>
       <wadl:link/>
@@ -77,9 +77,9 @@
       service.-->
 
   <!--Begin resource_type definitions for collection resources.-->
-
+  
     <wadl:resource_type id="accounts">
-
+      
       <wadl:method name="GET" id="accounts-get">
         <wadl:response>
           <wadl:representation
@@ -95,21 +95,21 @@
 Get details for the currently authenticated user.
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true" fixed="me">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="accounts-team_memberships" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Query account for team memberships
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="team_memberships">
@@ -120,18 +120,18 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of team names to check
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="accounts-validate_email" name="GET">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Validate email by sending token user received in email
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="validate_email">
@@ -142,18 +142,18 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Email validation token.
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
     </wadl:resource_type>
 
-
-
+  
+  
     <wadl:resource_type id="authentications">
-
+      
       <wadl:method name="GET" id="authentications-get">
         <wadl:response>
           <wadl:representation
@@ -169,14 +169,14 @@
 Get details for the currently authenticated user.
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true" fixed="me">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-authenticate"
                    name="GET">
@@ -184,7 +184,7 @@
 Obtain OAuth token for logged in user
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true" fixed="authenticate">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
@@ -194,11 +194,11 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Token name.
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-team_memberships"
                    name="GET">
@@ -206,7 +206,7 @@
 Query user for team memberships
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="team_memberships">
@@ -217,18 +217,18 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of team names to check
 </wadl:doc>
-
+              
             </wadl:param>
             <wadl:param style="query" required="true"
                         name="openid_identifier">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 OpenID Identifier used for asking forteam memberships on behalf of other user.
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-validate_token"
                    name="GET">
@@ -238,7 +238,7 @@
 
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="validate_token">
@@ -249,18 +249,41 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The token you want to validate
 </wadl:doc>
-
+              
             </wadl:param>
             <wadl:param style="query" required="true"
                         name="consumer_key">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The consumer key (openid identifier)
 </wadl:doc>
-
-            </wadl:param>
-
-        </wadl:request>
-
+              
+            </wadl:param>
+          
+        </wadl:request>
+        
+      </wadl:method>
+      <wadl:method id="authentications-account_by_openid"
+                   name="GET">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Retrieve account information based on OpenID identifier
+</wadl:doc>
+        <wadl:request>
+          
+            <wadl:param style="query" name="ws.op"
+                        required="true"
+                        fixed="account_by_openid">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="openid">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+OpenID Identifier of the account
+</wadl:doc>
+              
+            </wadl:param>
+          
+        </wadl:request>
+        
       </wadl:method>
       <wadl:method id="authentications-validate_email"
                    name="GET">
@@ -268,7 +291,7 @@
 Validate email by sending token user received in email
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="validate_email">
@@ -279,11 +302,11 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Email validation token.
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-account_by_email"
                    name="GET">
@@ -291,7 +314,7 @@
 Retrieve account information based on email address
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="account_by_email">
@@ -300,13 +323,13 @@
             <wadl:param style="query" required="true"
                         name="email">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Email address of the account.
+Email address of the account
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-list_tokens"
                    name="GET">
@@ -314,7 +337,7 @@
 Get the currently valid tokens for a given user
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true" fixed="list_tokens">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
@@ -324,11 +347,11 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 User's OpenID identifier
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="authentications-invalidate_token"
                    name="POST">
@@ -348,25 +371,25 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The token you want to invalidate
 </wadl:doc>
-
+              
             </wadl:param>
             <wadl:param style="query" required="true"
                         name="consumer_key">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 The consumer key (openid identifier)
 </wadl:doc>
-
+              
             </wadl:param>
           </wadl:representation>
         </wadl:request>
-
+        
       </wadl:method>
     </wadl:resource_type>
 
-
-
+  
+  
     <wadl:resource_type id="captchas">
-
+      
       <wadl:method name="GET" id="captchas-get">
         <wadl:response>
           <wadl:representation
@@ -390,14 +413,14 @@
             </wadl:param>
           </wadl:representation>
         </wadl:request>
-
+        
       </wadl:method>
     </wadl:resource_type>
 
-
-
+  
+  
     <wadl:resource_type id="registrations">
-
+      
       <wadl:method name="GET" id="registrations-get">
         <wadl:response>
           <wadl:representation
@@ -413,14 +436,14 @@
 Get details for the currently authenticated user.
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true" fixed="me">
               <wadl:doc>The name of the operation being invoked.</wadl:doc>
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="registrations-team_memberships"
                    name="GET">
@@ -428,7 +451,7 @@
 Query account for team memberships
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="team_memberships">
@@ -439,11 +462,11 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of team names to check
 </wadl:doc>
-
+              
             </wadl:param>
-
+          
         </wadl:request>
-
+        
       </wadl:method>
       <wadl:method id="registrations-validate_email"
                    name="GET">
@@ -451,7 +474,7 @@
 Validate email by sending token user received in email
 </wadl:doc>
         <wadl:request>
-
+          
             <wadl:param style="query" name="ws.op"
                         required="true"
                         fixed="validate_email">
@@ -462,11 +485,73 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Email validation token.
 </wadl:doc>
-
-            </wadl:param>
-
-        </wadl:request>
-
+              
+            </wadl:param>
+          
+        </wadl:request>
+        
+      </wadl:method>
+      <wadl:method id="registrations-request_password_reset_token"
+                   name="POST">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Request password reset code to be sent to the email
+</wadl:doc>
+        <wadl:request>
+          <wadl:representation
+    mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op"
+                        required="true"
+                        fixed="request_password_reset_token">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="email">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Email address.
+</wadl:doc>
+              
+            </wadl:param>
+          </wadl:representation>
+        </wadl:request>
+        
+      </wadl:method>
+      <wadl:method id="registrations-set_new_password"
+                   name="POST">
+        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Set new password for given user
+</wadl:doc>
+        <wadl:request>
+          <wadl:representation
+    mediaType="application/x-www-form-urlencoded">
+            <wadl:param style="query" name="ws.op"
+                        required="true"
+                        fixed="set_new_password">
+              <wadl:doc>The name of the operation being invoked.</wadl:doc>
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="new_password">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+New password
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="token">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Password reset token.
+</wadl:doc>
+              
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="email">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Email address.
+</wadl:doc>
+              
+            </wadl:param>
+          </wadl:representation>
+        </wadl:request>
+        
       </wadl:method>
       <wadl:method id="registrations-register" name="POST">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
@@ -484,102 +569,43 @@
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Solution for the generated captcha.
 </wadl:doc>
-
+              
             </wadl:param>
             <wadl:param style="query" required="true"
                         name="password">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Password should be at least 8 characters long and contain at least one uppercase letter and a number.
 </wadl:doc>
-
+              
             </wadl:param>
             <wadl:param style="query" required="true"
                         name="captcha_id">
              <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 ID for the generated captcha
 </wadl:doc>
-
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="email">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Email address.
-</wadl:doc>
-
-            </wadl:param>
-          </wadl:representation>
-        </wadl:request>
-
-      </wadl:method>
-      <wadl:method id="registrations-request_password_reset_token" name="POST">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Generate a new captcha
-</wadl:doc>
-        <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="request_password_reset_token">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="email">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Email address.
-</wadl:doc>
-
-            </wadl:param>
-          </wadl:representation>
-        </wadl:request>
-
-      </wadl:method>
-      <wadl:method id="registrations-set_new_password" name="POST">
-        <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Generate a new captcha
-</wadl:doc>
-        <wadl:request>
-          <wadl:representation
-    mediaType="application/x-www-form-urlencoded">
-            <wadl:param style="query" name="ws.op"
-                        required="true" fixed="set_new_password">
-              <wadl:doc>The name of the operation being invoked.</wadl:doc>
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="email">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Email address.
-</wadl:doc>
-
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="token">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-Password reset token.
-</wadl:doc>
-
-            </wadl:param>
-            <wadl:param style="query" required="true"
-                        name="new_password">
-             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
-New password
-</wadl:doc>
-
-            </wadl:param>
-          </wadl:representation>
-        </wadl:request>
-
-      </wadl:method>
-
+              
+            </wadl:param>
+            <wadl:param style="query" required="true"
+                        name="email">
+             <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
+Email address.
+</wadl:doc>
+              
+            </wadl:param>
+          </wadl:representation>
+        </wadl:request>
+        
+      </wadl:method>
     </wadl:resource_type>
 
-
+  
   <!--End resource_type definitions for collection resources.-->
 
   <!--Begin representation and resource_type definitions for entry
       resources and the collections that contain them. -->
-
+  
     <wadl:resource_type id="account">
-
+      
       <wadl:method name="GET" id="account-get">
         <wadl:response>
           <wadl:representation
@@ -606,7 +632,7 @@
         </wadl:request>
       </wadl:method>
 
-
+      
 
     </wadl:resource_type>
 
@@ -634,7 +660,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['unverified_emails']"
@@ -642,14 +668,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['verified_emails']"
@@ -657,7 +683,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -669,7 +695,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['unverified_emails']"
@@ -677,14 +703,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['verified_emails']"
@@ -692,7 +718,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -731,10 +757,10 @@
       </wadl:param>
   </wadl:representation>
 
-
-
+  
+  
     <wadl:resource_type id="authentication">
-
+      
       <wadl:method name="GET" id="authentication-get">
         <wadl:response>
           <wadl:representation
@@ -762,7 +788,7 @@
         </wadl:request>
       </wadl:method>
 
-
+      
 
     </wadl:resource_type>
 
@@ -790,7 +816,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['unverified_emails']"
@@ -798,14 +824,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['verified_emails']"
@@ -813,7 +839,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -825,7 +851,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['unverified_emails']"
@@ -833,14 +859,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['verified_emails']"
@@ -848,7 +874,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -888,10 +914,10 @@
       </wadl:param>
   </wadl:representation>
 
-
-
+  
+  
     <wadl:resource_type id="captcha">
-
+      
       <wadl:method name="GET" id="captcha-get">
         <wadl:response>
           <wadl:representation
@@ -918,7 +944,7 @@
         </wadl:request>
       </wadl:method>
 
-
+      
 
     </wadl:resource_type>
 
@@ -945,14 +971,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Captcha content
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Captcha ID
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -963,14 +989,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Captcha content
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Captcha ID
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -1009,10 +1035,10 @@
       </wadl:param>
   </wadl:representation>
 
-
-
+  
+  
     <wadl:resource_type id="registration">
-
+      
       <wadl:method name="GET" id="registration-get">
         <wadl:response>
           <wadl:representation
@@ -1040,7 +1066,7 @@
         </wadl:request>
       </wadl:method>
 
-
+      
 
     </wadl:resource_type>
 
@@ -1068,7 +1094,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['unverified_emails']"
@@ -1076,14 +1102,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['verified_emails']"
@@ -1091,7 +1117,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -1103,7 +1129,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['unverified_emails']"
@@ -1111,14 +1137,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['verified_emails']"
@@ -1126,7 +1152,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -1166,10 +1192,10 @@
       </wadl:param>
   </wadl:representation>
 
-
-
+  
+  
     <wadl:resource_type id="validation">
-
+      
       <wadl:method name="GET" id="validation-get">
         <wadl:response>
           <wadl:representation
@@ -1196,7 +1222,7 @@
         </wadl:request>
       </wadl:method>
 
-
+      
 
     </wadl:resource_type>
 
@@ -1224,7 +1250,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['unverified_emails']"
@@ -1232,14 +1258,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="true"
                   path="$['verified_emails']"
@@ -1247,7 +1273,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -1259,7 +1285,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Primary email address
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['unverified_emails']"
@@ -1267,14 +1293,14 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of unverified emails
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['id']" name="id">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 Account ID
 </wadl:doc>
-
+        
       </wadl:param>
       <wadl:param style="plain" required="false"
                   path="$['verified_emails']"
@@ -1282,7 +1308,7 @@
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml">
 List of verified emails
 </wadl:doc>
-
+        
       </wadl:param>
     </wadl:representation>
 
@@ -1322,7 +1348,7 @@
       </wadl:param>
   </wadl:representation>
 
-
+  
   <!--End representation and resource_type definitions for entry
       resources. -->
 

=== modified file 'scripts/create_env'
--- scripts/create_env	2010-11-03 16:29:36 +0000
+++ scripts/create_env	2011-01-03 20:45:27 +0000
@@ -24,7 +24,7 @@
     url='http://10.55.56.106:8000'
     pypi="-i $url"
 else
-    pypi='-f "https://launchpad.net/lazr.restful/+download?start=21" -f "https://launchpad.net/lazr.restfulclient/+download?start=9"'
+    pypi="-f https://launchpad.net/lazr.restful/+download?start=21 -f https://launchpad.net/lazr.restfulclient/+download?start=9"
 fi
 
 virtualenv --distribute --no-site-packages $ENV
@@ -32,7 +32,7 @@
 
 pushd .
 cd /tmp
-if [ -n "$pypi" ]; then
+if [ -n "$url" ]; then
     wget -c "$url/media/dists/egenix-mx-base-3.1.3.zip"
     unzip egenix-mx-base-3.1.3.zip
 else

=== modified file 'scripts/test'
--- scripts/test	2010-10-28 13:54:25 +0000
+++ scripts/test	2011-01-03 20:45:27 +0000
@@ -123,8 +123,8 @@
 
     trap SIGINT
     sudo kill $sso_pid
+    wait $sso_pid
 
-    sleep 1
     echo 'Running tests against mock API provider...'
     cd mockservice/sso_mockserver
     sudo $ENV python mockserver.py &
@@ -133,6 +133,7 @@
     (cd doctests && python runner.py -m stories/api-authentications.txt)
     (cd doctests && python runner.py -m stories/api-workflows.txt)
     sudo kill $sso_pid
+    wait $sso_pid
 fi
 
 if [ "$unittest" = true ]