Merge lp:~salgado/launchpad/revert-10575-and-fix-tests into lp:launchpad

[Guilherme Salgado]

Reverts 10575 and fixes the two page tests that are known to be failing

=== modified file 'Makefile'
--- Makefile	2010-03-25 02:21:15 +0000
+++ Makefile	2010-03-26 13:37:35 +0000
@@ -324,7 +324,11 @@
 	$(RM) -r lib/mailman
 	$(RM) -rf lib/canonical/launchpad/icing/build/*
 	$(RM) -r $(CODEHOSTING_ROOT)
+	mv $(APIDOC_DIR)/wadl-testrunner-devel.xml \
+	    $(APIDOC_DIR)/wadl-testrunner-devel.xml.bak
 	$(RM) $(APIDOC_DIR)/wadl*.xml $(APIDOC_DIR)/*.html
+	mv $(APIDOC_DIR)/wadl-testrunner-devel.xml.bak \
+	    $(APIDOC_DIR)/wadl-testrunner-devel.xml
 	$(RM) -rf $(APIDOC_DIR).tmp
 	$(RM) $(BZR_VERSION_INFO)
 	$(RM) _pythonpath.py

=== added file 'lib/canonical/launchpad/apidoc/wadl-testrunner-devel.xml'
--- lib/canonical/launchpad/apidoc/wadl-testrunner-devel.xml	1970-01-01 00:00:00 +0000
+++ lib/canonical/launchpad/apidoc/wadl-testrunner-devel.xml	2010-03-26 13:37:35 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xmlns="http://research.sun.com/wadl/2006/10"
+                  xmlns:wadl="http://research.sun.com/wadl/2006/10"
+                  xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd">
+
+  <!--This file is for testing purposes only.  See
+      canonical/launcpad/pagetests/webservice/xx-wadl.txt -->
+
+</wadl:application>

=== modified file 'lib/canonical/launchpad/pagetests/standalone/xx-form-layout.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-form-layout.txt	2009-07-29 14:18:29 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-form-layout.txt	2010-03-26 13:37:35 +0000
@@ -60,8 +60,9 @@
         <label for="field.teamdescription">Team Description:</label>
         <span ...
         <div><textarea ... name="field.teamdescription" ...></textarea></div>
-        <p class="formHelp">Include information on how to get involved with
-          development. Use plain text; URLs will be linkified.</p>
+        <p class="formHelp">Details about the team's work, highlights, goals,
+          and how to contribute. Use plain text, paragraphs are preserved and
+          URLs are linked in pages.</p>
       </td>
     </tr>
     ...
@@ -76,8 +77,9 @@
         <label for="field.teamdescription">Team Description:</label>
         <span class="fieldRequired">(Optional)</span>
         <div><textarea ... name="field.teamdescription" ...></textarea></div>
-        <p class="formHelp">Include information on how to get involved with
-          development. Use plain text; URLs will be linkified.</p>
+        <p class="formHelp">Details about the team's work, highlights, goals,
+          and how to contribute. Use plain text, paragraphs are preserved and
+          URLs are linked in pages.</p>
       </td>
     </tr>
     ...

=== removed file 'lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt'
--- lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	2010-03-23 13:36:27 +0000
+++ lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Using launchpadlib in pagetests
-===============================
-
-As an alternative to crafting HTTP requests with the 'webservice'
-object, you can write pagetests using launchpadlib. The 'launchpad'
-variable contains a launchpadlib Launchpad object that's
-pre-authenticated with salgado's permissions. Anything you can do with
-'webservice', you can do with 'launchpad'.
-
-  >>> print launchpad.me.name
-  salgado

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-03-23 14:48:10 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt	2010-03-26 13:37:35 +0000
@@ -3,83 +3,55 @@
 Because Launchpad's main WADL files are so big, we cache them
 internally: one WADL file for every version of the web service.
 Because the WADL only changes when the Launchpad software changes,
-these documents are cached to files.
-
-This test shows how the cache works. We'll start by temporarily
-clearing the cache.
+these documents are cached to files.  Right now, the Launchpad
+webservice serves a special test file
+(canonical/launchpad/apidoc/wadl-testrunner-devel.xml) when a client
+asks for the big WADL definition for the 'devel' version. The
+'testrunner' part comes from canonical.config.config.instance_name, so
+a development instance will use the file
+canonical/launchpad/apidoc/wadl-development-{version}.xml.
+
+    >>> test_wadl = webservice.get(
+    ...     '/', 'application/vd.sun.wadl+xml', api_version='devel').body
+    >>> print test_wadl
+    <?xml version="1.0"?>
+    <wadl:application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                      xmlns="http://research.sun.com/wadl/2006/10"
+                      xmlns:wadl="http://research.sun.com/wadl/2006/10"
+                      xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd">
+    <BLANKLINE>
+      <!--This file is for testing purposes only.  See
+          canonical/launcpad/pagetests/webservice/xx-wadl.txt -->
+    <BLANKLINE>
+    </wadl:application>
+    <BLANKLINE>
+
+Let's look at the real contents, though.  To do this, we need to
+deactivate the cache. Simply clearing it out will just cause it to be
+filled up again.
 
     >>> from canonical.launchpad.systemhomes import WebServiceApplication
     >>> old_cached_wadl = WebServiceApplication.cached_wadl
-    >>> WebServiceApplication.cached_wadl = {}
-
-If WADL is present in a certain file on disk--the filename depends on
-the Launchpad configuration and the web service version--it will be
-loaded from disk and not generated from scratch. But the testrunner
-does not have any WADL files written to disk.
-
-    >>> import os
-    >>> wadl_filename = WebServiceApplication.cachedWADLPath(
-    ...     'testrunner', 'devel')
-    >>> os.path.exists(wadl_filename)
-    False
-
-Let's write some fake WADL to disk.
-
-    >>> fd = open(wadl_filename, "w")
-    >>> fd.write("Some fake WADL.")
-    >>> fd.close()
-
-When we request the WADL for version "devel", the fake WADL is loaded
-from disk.
-
-    >>> print webservice.get(
-    ...     '/', 'application/vd.sun.wadl+xml', api_version='devel').body
-    Some fake WADL.
-
-The fake WADL is now present in the cache.
-
-    >>> WebServiceApplication.cached_wadl
-    {u'devel': u'Some fake WADL.'}
-
-Change the cached value, and we change the document served.
-
-    >>> WebServiceApplication.cached_wadl['devel'] = "More fake WADL."
-
-    >>> print webservice.get(
-    ...     '/', 'application/vd.sun.wadl+xml', api_version='devel').body
-    More fake WADL.
-
-If there's no value in the cache and no cached file on disk, the WADL
-is generated from scratch.
-
-    >>> WebServiceApplication.cached_wadl = {}
-    >>> os.remove(wadl_filename)
+    >>> WebServiceApplication.cached_wadl = None
 
     >>> wadl = webservice.get(
     ...     '/', 'application/vd.sun.wadl+xml', api_version='devel').body
     >>> wadl = wadl.decode('UTF-8')
 
-Unlike the test strings we used earlier, this is a valid WADL file.
-
-    >>> from lazr.restful import WADL_SCHEMA_FILE
-    >>> from canonical.lazr.xml import XMLValidator
-    >>> wadl_schema = XMLValidator(WADL_SCHEMA_FILE)
-
-    # We need to replace the nbsp entity, because the validator
-    # doesn't support embedded definition.
-    >>> wadl_schema.validate(
-    ...     wadl.replace('&nbsp;', '&#160;').encode('UTF-8'))
+The real file is much bigger than the test file.
+
+    >>> len(wadl) > len(test_wadl)
     True
 
 The WADL we received is keyed to the 'devel' version of the web
-service. The URL to this version's service root will always be
-present.
+service. This version will always be present.
 
     >>> 'http://api.launchpad.dev/devel/' in wadl
     True
 
 If we retrieve the WADL for the '1.0' version of the web service,
-we'll get a document keyed to the '1.0' version.
+we'll get a document keyed to the '1.0' version. The '1.0' version
+will be deprecated along with the Lucid release of Ubuntu.
 
     >>> wadl_10 = webservice.get(
     ...     '/', 'application/vd.sun.wadl+xml', api_version='1.0').body
@@ -88,12 +60,31 @@
     >>> 'http://api.launchpad.dev/1.0/' in wadl_10
     True
 
-All of these documents were cached as they were generated:
-
-    >>> sorted(WebServiceApplication.cached_wadl.keys())
-    [u'1.0', u'devel']
-
-Finally, restore the cache so that other tests will have a clean
-slate.
+If we retrieve the WADL for the 'beta' version of the web service,
+we'll get a document keyed to the 'beta' version. The '1.0' version
+will be deprecated along with the Karmic release of Ubuntu.
+
+    >>> wadl_beta = webservice.get(
+    ...     '/', 'application/vd.sun.wadl+xml', api_version='beta').body
+    >>> wadl_beta = wadl_beta.decode('UTF-8')
+
+    >>> 'http://api.launchpad.dev/beta/' in wadl_beta
+    True
+
+We don't need the cache anymore, so we'll reinstate the testing
+version. This way, other tests will have a clean slate.
 
     >>> WebServiceApplication.cached_wadl = old_cached_wadl
+
+Like all lazr.restful applications, Launchpad's web service generates
+valid WADL.
+
+    >>> from lazr.restful import WADL_SCHEMA_FILE
+    >>> from canonical.lazr.xml import XMLValidator
+    >>> wadl_schema = XMLValidator(WADL_SCHEMA_FILE)
+
+    # We need to replace the nbsp entity, because the validator
+    # doesn't support embedded definition.
+    >>> wadl_schema.validate(
+    ...     wadl.replace('&nbsp;', '&#160;').encode('UTF-8'))
+    True

=== modified file 'lib/canonical/launchpad/systemhomes.py'
--- lib/canonical/launchpad/systemhomes.py	2010-03-23 11:43:06 +0000
+++ lib/canonical/launchpad/systemhomes.py	2010-03-26 13:37:35 +0000
@@ -354,13 +354,6 @@
 
     cached_wadl = {}
 
-    @classmethod
-    def cachedWADLPath(cls, instance_name, version):
-        """Helper method to calculate the path to a cached WADL file."""
-        return os.path.join(
-            os.path.dirname(os.path.normpath(__file__)),
-            'apidoc', 'wadl-%s-%s.xml' % (instance_name, version))
-
     def toWADL(self):
         """See `IWebServiceApplication`.
 
@@ -377,8 +370,10 @@
             return super(WebServiceApplication, self).toWADL()
         if  version not in self.__class__.cached_wadl:
             # It's not cached. Look for it on disk.
-            _wadl_filename = self.cachedWADLPath(
-                config.instance_name, version)
+            _wadl_filename = os.path.join(
+                os.path.dirname(os.path.normpath(__file__)),
+                'apidoc', 'wadl-%s-%s.xml' % (config.instance_name, version))
+
             _wadl_fd = None
             try:
                 _wadl_fd = codecs.open(_wadl_filename, encoding='UTF-8')

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2010-03-23 13:36:27 +0000
+++ lib/canonical/launchpad/testing/pages.py	2010-03-26 13:37:35 +0000
@@ -29,8 +29,6 @@
 from zope.testing import doctest
 from zope.security.proxy import removeSecurityProxy
 
-from launchpadlib.launchpad import Launchpad
-
 from canonical.launchpad.interfaces import (
     IOAuthConsumerSet, OAUTH_REALM, ILaunchpadCelebrities,
     TeamMembershipStatus)
@@ -727,9 +725,6 @@
         'launchpad-library', 'nopriv-read-nonprivate')
     test.globs['anon_webservice'] = LaunchpadWebServiceCaller(
         'launchpad-library', '')
-    test.globs['launchpad'] = Launchpad.login(
-        'launchpad-library', 'salgado-change-anything', 'test',
-        service_root='http://api.launchpad.dev/', version="devel")
     test.globs['setupBrowser'] = setupBrowser
     test.globs['setupDTCBrowser'] = setupDTCBrowser
     test.globs['setupRosettaExpertBrowser'] = setupRosettaExpertBrowser

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-03-23 13:51:03 +0000
+++ lib/canonical/testing/layers.py	2010-03-26 13:37:35 +0000
@@ -73,7 +73,6 @@
 from storm.zope.interfaces import IZStorm
 import transaction
 import wsgi_intercept
-from wsgi_intercept import httplib2_intercept
 
 from lazr.restful.utils import safe_hasattr
 
@@ -939,18 +938,12 @@
         register_launchpad_request_publication_factories()
         wsgi_intercept.add_wsgi_intercept(
             'localhost', 80, lambda: wsgi_application)
-        wsgi_intercept.add_wsgi_intercept(
-            'api.launchpad.dev', 80, lambda: wsgi_application)
-        httplib2_intercept.install()
-
 
     @classmethod
     @profiled
     def tearDown(cls):
         FunctionalLayer.isSetUp = False
         wsgi_intercept.remove_wsgi_intercept('localhost', 80)
-        wsgi_intercept.remove_wsgi_intercept('api.launchpad.dev', 80)
-        httplib2_intercept.uninstall()
         # Signal Layer cannot be torn down fully
         raise NotImplementedError
 

=== modified file 'lib/lp/registry/stories/product/xx-product-add.txt'
--- lib/lp/registry/stories/product/xx-product-add.txt	2010-01-08 16:37:33 +0000
+++ lib/lp/registry/stories/product/xx-product-add.txt	2010-03-26 13:37:35 +0000
@@ -51,7 +51,7 @@
     The project title. Should be just a few words.
     Summary:
     Required input is missing.
-    The summary should be a single short paragraph.
+    A short paragraph to introduce the project's work.
 
 Realizing her mistake, Sample Person fills out the project's basic information
 correctly this time.