Merge lp:~bac/launchpad/lplib-testing into lp:launchpad

[Brad Crittenden]

Changes to support launchpadlib testing, allow milestones to be retrieved by anonymous lplib user.

= Summary =

Attempts to convert a webservice test to a launchpadlib test discovered
many problems that are fixed in this jumbled up branch.

== Proposed fix ==

=== modified file 'lib/canonical/launchpad/security.py'
 * The only production bug of the lot. Allow milestones to be accessed
anonymously via launchpadlib.

=== modified file 'lib/canonical/launchpad/testing/systemdocs.py'
 * Export the new launchpadlib helper methods to doctests instead of
just pagetests.

=== added file
'lib/lp/registry/doc/launchpadlib/project-registry.txt.disabled'
 * New launchpadlib test file. It is disabled because there are
outstanding issues with the test environment and the tests will not pass
as written. I need to file a bug for the issues and put an XXX into the
beginning of this file. The biggest issue is logged in users with
permission are not allowed to see non-public data or make changes.

=== modified file 'lib/lp/services/testing/__init__.py'
 * Refactor to expose the new method 'build_doctest_suite' which is used
to register a subset of all tests. This is used in the registry test
registration.

=== modified file 'lib/lp/testing/_webservice.py'
 * Silly formatting fixes.

=== modified file 'lib/lp/registry/tests/test_doc.py'
 * Allow the discovery of tests in lp/registry/doc/launchpadlib

== Pre-implementation notes ==

Chats with Curtis, Leonard, Gary and Francis.

== Implementation details ==

Nothing interesting.

== Tests ==

Hmm, none really at this time. The test that proves milestones are now
accessible is in the launchpadlib test.

I'll add a web service test to show that milestones are retrievable by
anonymous users.

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/security.py
  lib/lp/registry/doc/launchpadlib/project-registry.txt.disabled
  lib/lp/registry/tests/test_doc.py
  lib/canonical/launchpad/testing/systemdocs.py
  lib/lp/testing/_webservice.py
  lib/lp/services/testing/__init__.py

== Pylint notices ==

lib/canonical/launchpad/testing/systemdocs.py
    6: [W0105] String statement has no effect

lib/lp/services/testing/__init__.py
    31: [W0102, build_doctest_suite] Dangerous default value {} as argument
    60: [W0102, build_test_suite] Dangerous default value {} as argument

[Brad Crittenden (bac)]

Here is the missing test: http://pastebin.ubuntu.com/421231/

[Curtis Hovey (sinzui)]

Thanks for salvaging your branch. The milestone fix and test harness enhancement is much appreciated.

I think you are missing punctuation:
    # Add doctests using default setup/teardown

review: Approve

[Robert Collins (lifeless)]

I'm just curious, does this then glue lplib to the test instance of
launchpad ? Could this be adapted to let third party authors test
their code with lplib against a local launchpad [started up by the
test environment] ?

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-04-20 08:01:41 +0000
+++ lib/canonical/launchpad/security.py	2010-04-25 14:29:32 +0000
@@ -375,6 +375,11 @@
     usedfor = IDistributionMirror
 
 
+class ViewMilestone(AnonymousAuthorization):
+    """Anyone can view an IMilestone."""
+    usedfor = IMilestone
+
+
 class EditSpecificationBranch(AuthorizationBase):
 
     usedfor = ISpecificationBranch

=== modified file 'lib/canonical/launchpad/testing/systemdocs.py'
--- lib/canonical/launchpad/testing/systemdocs.py	2010-03-24 10:15:57 +0000
+++ lib/canonical/launchpad/testing/systemdocs.py	2010-04-25 14:29:32 +0000
@@ -1,10 +1,10 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+"""Infrastructure for setting up doctests."""
+
 from __future__ import with_statement
 
-"""Infrastructure for setting up doctests."""
-
 __metaclass__ = type
 __all__ = [
     'default_optionflags',
@@ -34,7 +34,9 @@
 from canonical.launchpad.interfaces import ILaunchBag
 from canonical.launchpad.webapp.testing import verifyObject
 from canonical.testing import reset_logging
-from lp.testing import ANONYMOUS, login, login_person, logout
+from lp.testing import (
+    ANONYMOUS, launchpadlib_credentials_for, launchpadlib_for, login,
+    login_person, logout, oauth_access_token_for)
 from lp.testing.factory import LaunchpadObjectFactory
 from lp.testing.views import create_view, create_initialized_view
 
@@ -202,6 +204,9 @@
     test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat
     test.globs['stop'] = stop
     test.globs['with_statement'] = with_statement
+    test.globs['launchpadlib_for'] = launchpadlib_for
+    test.globs['launchpadlib_credentials_for'] = launchpadlib_credentials_for
+    test.globs['oauth_access_token_for'] = oauth_access_token_for
 
 
 def setUp(test):

=== added directory 'lib/lp/registry/doc/launchpadlib'
=== added file 'lib/lp/registry/doc/launchpadlib/project-registry.txt.disabled'
--- lib/lp/registry/doc/launchpadlib/project-registry.txt.disabled	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/doc/launchpadlib/project-registry.txt.disabled	2010-04-25 14:29:32 +0000
@@ -0,0 +1,374 @@
+# XXX bug=569189, bac 2010-04-23
+# This test is disabled due to a bug which prevents authenticated
+# users from writing data or reading any data with a permission
+# attached.
+
+==============
+Project Groups
+==============
+
+
+Project group collection
+------------------------
+
+It is possible to get a batched list of all the project groups.
+
+    >>> from launchpadlib.launchpad import Launchpad
+    >>> from lp.testing._login import logout
+    >>> logout()
+    >>> lp_anon = Launchpad.login_anonymously('launchpadlib test',
+    ...                                       'http://api.launchpad.dev/')
+    >>> len(lp_anon.project_groups)
+    7
+
+    >>> project_groups = sorted(lp_anon.project_groups, key=lambda X: X.name)
+    >>> project_groups[0].self_link
+    u'http://.../aaa'
+
+    >>> for project_group in project_groups:
+    ...     print "%s (%s)" % (project_group.name, project_group.display_name)
+    aaa (the Test Project)
+    apache (Apache)
+    gimp (the GiMP Project)
+    gnome (GNOME)
+    iso-codes-project (iso-codes)
+    launchpad-mirrors (Launchpad SCM Mirrors)
+    mozilla (the Mozilla Project)
+
+It's possible to search the list and get a subset of the project groups.
+
+    >>> lp_anon = Launchpad.login_anonymously('launchpadlib test',
+    ...                                       'http://api.launchpad.dev/')
+    >>> project_groups = lp_anon.project_groups.search(text="Apache")
+    >>> for project_group in project_groups:
+    ...   print project_group.display_name
+    Apache
+
+Searching without providing a search string is the same as getting all
+the project groups.
+
+    >>> project_groups = lp_anon.project_groups.search()
+    >>> project_groups = sorted(project_groups, key=lambda X: X.name)
+    >>> for project_group in project_groups:
+    ...     print "%s (%s)" % (project_group.name, project_group.display_name)
+    aaa (the Test Project)
+    apache (Apache)
+    gimp (the GiMP Project)
+    gnome (GNOME)
+    iso-codes-project (iso-codes)
+    launchpad-mirrors (Launchpad SCM Mirrors)
+    mozilla (the Mozilla Project)
+
+Project group object
+--------------------
+
+An individual project group can be accessed using dictionary-like syntax.
+
+    >>> mozilla = lp_anon.project_groups['mozilla']
+
+A project group supplies many attributes, collections, operations.
+
+    >>> from operator import attrgetter
+    >>> def pprint_object(obj):
+    ...     groups = ['lp_attributes',
+    ...               'lp_collections',
+    ...               'lp_entries']
+    ...     items = []
+    ...     for group in groups:
+    ...         items.extend(attrgetter(group)(obj))
+    ...     items.remove('http_etag')
+    ...     for item in sorted(items):
+    ...         value = attrgetter(item)(obj)
+    ...         print "%s: %s" % (item, value)
+
+The project group object has a large set of properties that can be
+accessed directly.
+
+    >>> pprint_object(mozilla)
+    active: True
+    active_milestones: <lazr.restfulclient.resource.Collection object...>
+    all_milestones: <lazr.restfulclient.resource.Collection object ...>
+    bug_reporting_guidelines: None
+    bug_tracker: None
+    date_created: 2004-09-24 20:58:02.177698+00:00
+    description: The Mozilla Project produces several internet applications ...
+    display_name: the Mozilla Project
+    driver: None
+    freshmeat_project: None
+    homepage_content: None
+    homepage_url: http://www.mozilla.org/
+    icon: <lazr.restfulclient.resource.HostedFile object ...>
+    logo: <lazr.restfulclient.resource.HostedFile object ...>
+    mugshot: <lazr.restfulclient.resource.HostedFile object ...>
+    name: mozilla
+    official_bug_tags: []
+    owner: http://.../~name12
+    projects: <lazr.restfulclient.resource.Collection object ...>
+    registrant: http://.../~name12
+    resource_type_link: http://.../#project_group
+    reviewed: False
+    self_link: http://.../mozilla
+    sourceforge_project: None
+    summary: The Mozilla Project is the largest open source web browser...
+    title: The Mozilla Project
+    wiki_url: None
+
+The milestones can be accessed through the active_milestones
+collection and the all_milestones collection.
+
+    >>> def print_collection(collection, attrs=None):
+    ...     items = [str(item) for item in collection]
+    ...     for item in sorted(items):
+    ...         print item
+
+    >>> print_collection(sorted(mozilla.active_milestones))
+    http://api.launchpad.dev/.../mozilla/+milestone/1.0
+
+    >>> print_collection(sorted(mozilla.all_milestones))
+    http://.../mozilla/+milestone/0.8
+    http://.../mozilla/+milestone/0.9
+    http://.../mozilla/+milestone/0.9.1
+    http://.../mozilla/+milestone/0.9.2
+    http://.../mozilla/+milestone/1.0
+    http://.../mozilla/+milestone/1.0.0
+
+
+An individual milestone can be retrieved.  None is returned if it
+doesn't exist.
+
+    >>> print mozilla.getMilestone(name="1.0")
+    http://.../mozilla/+milestone/1.0
+
+    >>> print mozilla.getMilestone(name="fnord")
+    None
+
+
+Project objects
+---------------
+
+The Launchpad 'projects' collection is used to select an individual
+project, which has a large number of attributes.  Some of the
+attributes are marked as 'redacted' as they are only visible to
+project administrators.
+
+    >>> firefox = lp_anon.projects['firefox']
+    >>> pprint_object(firefox)
+    active: True
+    active_milestones: <lazr.restfulclient.resource.Collection object...>
+    all_milestones: <lazr.restfulclient.resource.Collection object...>
+    brand: <lazr.restfulclient.resource.HostedFile object...>
+    bug_reporting_guidelines: None
+    bug_tracker: None
+    commercial_subscription: None
+    commercial_subscription_is_due: True
+    date_created: 2004-09-24 20:58:02.185708+00:00
+    description: The Mozilla Firefox web browser
+    development_focus: http://.../firefox/trunk
+    display_name: Mozilla Firefox
+    download_url: None
+    driver: None
+    freshmeat_project: None
+    homepage_url: None
+    icon: <lazr.restfulclient.resource.HostedFile object...>
+    is_permitted: ...redacted
+    license_approved: ...redacted
+    license_info: None
+    license_reviewed: ...redacted
+    licenses: []
+    logo: <lazr.restfulclient.resource.HostedFile object...>
+    name: firefox
+    official_bug_tags: []
+    owner: http://.../~name12
+    programming_language: None
+    project_group: http://.../mozilla
+    qualifies_for_free_hosting: False
+    registrant: http://.../~name12
+    releases: <lazr.restfulclient.resource.Collection object...>
+    remote_product: None
+    resource_type_link: http://.../#project
+    reviewer_whiteboard: ...redacted
+    screenshots_url: None
+    self_link: http://.../firefox
+    series: <lazr.restfulclient.resource.Collection object...>
+    sourceforge_project: None
+    summary: The Mozilla Firefox web browser
+    title: Mozilla Firefox
+    translation_focus: None
+    wiki_url: None
+
+Getting a Launchpad object based on an administrator's credentials
+allows the previously redacted attributes to be seen.
+
+    >>> lp_mark = launchpadlib_for(
+    ...     'launchpadlib test', 'mark', 'READ_PRIVATE')
+    >>> print lp_mark.me.name
+    mark
+    >>> firefox = lp_mark.projects['firefox']
+    >>> print firefox.license_reviewed
+    False
+
+In Launchpad project names may not have uppercase letters in their
+name.  As a convenience, requests for projects using the wrong case
+return the correct project.
+
+    >>> firefox = lp_anon.projects['Firefox']
+    >>> print firefox.title
+    Mozilla Firefox
+
+The milestones can be accessed through the active_milestones
+collection and the all_milestones collection.
+
+    >>> # This should not be needed but using the object fetched above causes a
+    >>> # 301-Moved Permanently exception.
+    >>> firefox = lp_anon.projects['firefox']
+    >>> print_collection(sorted(firefox.active_milestones))
+    http://api.launchpad.dev/.../firefox/+milestone/1.0
+
+    >>> print_collection(sorted(firefox.all_milestones))
+    http://.../firefox/+milestone/0.9
+    http://.../firefox/+milestone/0.9.1
+    http://.../firefox/+milestone/0.9.2
+    http://.../firefox/+milestone/1.0
+    http://.../firefox/+milestone/1.0.0
+
+An individual milestone can be retrieved.  None is returned if it
+doesn't exist.
+
+    >>> print firefox.getMilestone(name="1.0")
+    http://.../firefox/+milestone/1.0
+
+    >>> print firefox.getMilestone(name="fnord")
+    None
+
+A list of series can be accessed through the series_collection_link.
+
+    >>> print_collection(firefox.series)
+    http://.../firefox/1.0
+    http://.../firefox/trunk
+
+"getSeries" returns the series for the given name.
+
+    >>> series = firefox.getSeries(name="1.0")
+    >>> print series.self_link
+    http://.../firefox/1.0
+
+A list of releases can be accessed through the releases_collection_link.
+
+    >>> print_collection(firefox.releases)
+    http://.../firefox/1.0/1.0.0
+    http://.../firefox/trunk/0.9
+    http://.../firefox/trunk/0.9.1
+    http://.../firefox/trunk/0.9.2
+
+"getRelease" returns the release for the given version.
+
+    >>> release = firefox.getRelease(version="0.9.1")
+    >>> print release.self_link
+    http://.../firefox/trunk/0.9.1
+
+The development focus series can be accessed through the
+development_focus attribute.
+
+    >>> print firefox.development_focus.self_link
+    http://.../firefox/trunk
+
+Attributes can be edited, but not by the anonymous user.
+
+    >>> mark = lp_anon.people['mark']
+    >>> firefox.driver = mark
+    >>> firefox.lp_save()
+    Traceback (most recent call last):
+      ...
+    HTTPError: HTTP Error 401: Unauthorized...
+
+A project administrator can modify attributes on the project.
+
+    >>> mark = lp_mark.people['mark']
+    >>> firefox = lp_mark.projects['firefox']
+    >>> firefox.driver = mark
+    >>> firefox.homepage_url = 'http://sf.net/firefox'
+    >>> firefox.lp_save()
+
+    >>> print firefox.driver.self_link
+    http://.../~mark
+    >>> print firefox.homepage_url
+    http://sf.net/firefox
+
+Changing the owner of a project can change other attributes as well.
+
+    >>> # Create a product with a series and release.
+    >>> login('[e-mail]')
+    >>> test_project_owner = factory.makePerson(name='test-project-owner')
+    >>> test_project = factory.makeProduct(
+    ...     name='test-project', owner=test_project_owner)
+    >>> test_series = factory.makeProductSeries(
+    ...     product=test_project, name='test-series',
+    ...     owner=test_project_owner)
+    >>> test_milestone = factory.makeMilestone(
+    ...     product=test_project, name='test-milestone',
+    ...     productseries=test_series)
+    >>> test_project_release = factory.makeProductRelease(
+    ...     product=test_project, milestone=test_milestone)
+    >>> logout()
+
+    >>> nopriv = lp_mark.people['no-priv']
+    >>> test_project = lp_mark.projects['test-project']
+    >>> test_project.owner = nopriv
+    >>> test_project.lp_save()
+    >>> print test_project.owner.self_link
+    http://.../~name12
+    >>> test_series = test_project.getSeries(name="test-series")
+    >>> print test_series.owner.self_link
+    http://.../~name12
+
+    >>> release = test_project.getMilestone(name='test-milestone')
+    >>> print release.owner.self_link
+    http://.../~name12
+
+Read-only attributes cannot be changed.
+
+    >>> firefox.registrant = nopriv
+    >>> firefox.lp_save()
+    Traceback (most recent call last):
+      ...
+    HTTPError: HTTP Error 400: Bad Request
+    ...
+    registrant_link: You tried to modify a read-only attribute...
+
+"get_timeline" returns a list of dictionaries, corresponding to each
+milestone and release.
+
+    >>> print pretty(firefox.get_timeline())
+    [{u'is_development_focus': False,
+      u'landmarks': [{u'code_name': u'First Stable Release',
+                      u'date': u'2004-06-28',
+                      u'name': u'1.0.0',
+                      u'type': u'release',
+                      u'uri': u'/firefox/1.0/1.0.0'}],
+      u'name': u'1.0',
+      u'status': u'Active Development',
+      u'uri': u'/firefox/1.0'},
+     {u'is_development_focus': True,
+      u'landmarks': [{u'code_name': None,
+                      u'date': u'2056-10-16',
+                      u'name': u'1.0',
+                      u'type': u'milestone',
+                      u'uri': u'/firefox/+milestone/1.0'},
+                     {u'code_name': u'One (secure) Tree Hill',
+                      u'date': u'2004-10-15',
+                      u'name': u'0.9.2',
+                      u'type': u'release',
+                      u'uri': u'/firefox/trunk/0.9.2'},
+                     {u'code_name': u'One Tree Hill (v2)',
+                      u'date': u'2004-10-15',
+                      u'name': u'0.9.1',
+                      u'type': u'release',
+                      u'uri': u'/firefox/trunk/0.9.1'},
+                     {u'code_name': u'One Tree Hill',
+                      u'date': u'2004-10-15',
+                      u'name': u'0.9',
+                      u'type': u'release',
+                      u'uri': u'/firefox/trunk/0.9'}],
+      u'name': u'trunk',
+      u'status': u'Active Development',
+      u'uri': u'/firefox/trunk'}]

=== modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt'
--- lib/lp/registry/stories/webservice/xx-project-registry.txt	2010-04-23 03:02:31 +0000
+++ lib/lp/registry/stories/webservice/xx-project-registry.txt	2010-04-25 14:29:32 +0000
@@ -108,6 +108,24 @@
     http://.../mozilla/+milestone/0.9.2
     http://.../mozilla/+milestone/1.0.0
 
+The milestones can also be accessed anonymously.
+
+    >>> response = anon_webservice.get(
+    ...     mozilla['active_milestones_collection_link'])
+    >>> active_milestones = response.jsonBody()
+    >>> print_self_link_of_entries(active_milestones)
+    http://.../mozilla/+milestone/1.0
+
+    >>> response = anon_webservice.get(
+    ...     mozilla['all_milestones_collection_link'])
+    >>> all_milestones = response.jsonBody()
+    >>> print_self_link_of_entries(all_milestones)
+    http://.../mozilla/+milestone/0.8
+    http://.../mozilla/+milestone/0.9
+    http://.../mozilla/+milestone/0.9.1
+    http://.../mozilla/+milestone/0.9.2
+    http://.../mozilla/+milestone/1.0.0
+
 "getMilestone" returns a milestone for the given name, or None if there
 is no milestone for the given name.
 

=== modified file 'lib/lp/registry/tests/test_doc.py'
--- lib/lp/registry/tests/test_doc.py	2009-10-01 14:48:09 +0000
+++ lib/lp/registry/tests/test_doc.py	2010-04-25 14:29:32 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """
@@ -16,7 +16,7 @@
     LaunchpadZopelessLayer)
 
 from lp.registry.tests import mailinglists_helper
-from lp.services.testing import build_test_suite
+from lp.services.testing import build_doctest_suite, build_test_suite
 
 
 here = os.path.dirname(os.path.realpath(__file__))
@@ -28,6 +28,7 @@
     DatabaseLayer.force_dirty_database()
     tearDown(test)
 
+
 def mailingListXMLRPCInternalSetUp(test):
     setUp(test)
     # Use the direct API view instance, not retrieved through the component
@@ -182,4 +183,9 @@
 
 
 def test_suite():
-    return build_test_suite(here, special, layer=DatabaseFunctionalLayer)
+    suite = build_test_suite(here, special, layer=DatabaseFunctionalLayer)
+    launchpadlib_path = os.path.join(os.path.pardir,  'doc', 'launchpadlib')
+    lplib_suite = build_doctest_suite(here, launchpadlib_path,
+                                      layer=DatabaseFunctionalLayer)
+    suite.addTest(lplib_suite)
+    return suite

=== modified file 'lib/lp/services/testing/__init__.py'
--- lib/lp/services/testing/__init__.py	2010-01-12 21:03:16 +0000
+++ lib/lp/services/testing/__init__.py	2010-04-25 14:29:32 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """
@@ -10,6 +10,12 @@
  doc/ - Contains doctests
 """
 
+__metaclass__ = type
+__all__ = [
+    'build_doctest_suite',
+    'build_test_suite',
+    ]
+
 import logging
 import os
 import unittest
@@ -20,14 +26,43 @@
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite, setUp, tearDown)
 from canonical.testing import DatabaseFunctionalLayer
-from canonical.launchpad.testing.systemdocs import strip_prefix
+
+
+def build_doctest_suite(base_dir, tests_path, special_tests={},
+                        layer=DatabaseFunctionalLayer,
+                        setUp=setUp, tearDown=tearDown,
+                        package=None):
+    """Build the doc test suite."""
+    suite = unittest.TestSuite()
+    # Tests are run relative to the calling module, not this module.
+    if package is None:
+        package = doctest._normalize_module(None)
+    testsdir = os.path.abspath(
+        os.path.normpath(os.path.join(base_dir, tests_path)))
+
+    if os.path.exists(testsdir):
+        # Add doctests using default setup/teardown.
+        filenames = [filename
+                     for filename in os.listdir(testsdir)
+                     if (filename.endswith('.txt')
+                         and filename not in special_tests)]
+        # Sort the list to give a predictable order.
+        filenames.sort()
+        for filename in filenames:
+            path = os.path.join(tests_path, filename)
+            one_test = LayeredDocFileSuite(
+                path, package=package, setUp=setUp, tearDown=tearDown,
+                layer=layer, stdout_logging_level=logging.WARNING)
+            suite.addTest(one_test)
+    return suite
+
 
 def build_test_suite(base_dir, special_tests={},
                      layer=DatabaseFunctionalLayer,
                      setUp=setUp, tearDown=tearDown):
     """Build a test suite from a directory containing test files.
 
-    The parent's 'stories' subdirectory will be checked for pagetests and 
+    The parent's 'stories' subdirectory will be checked for pagetests and
     the parent's 'doc' subdirectory will be checked for doctests.
 
     :param base_dir: The tests subdirectory that.
@@ -63,24 +98,6 @@
         suite.addTest(special_suite)
 
     tests_path = os.path.join(os.path.pardir, 'doc')
-    testsdir = os.path.abspath(
-        os.path.normpath(os.path.join(base_dir, tests_path))
-        )
-
-    if os.path.exists(testsdir):
-        # Add doctests using default setup/teardown
-        filenames = [filename
-                     for filename in os.listdir(testsdir)
-                     if (filename.endswith('.txt')
-                         and filename not in special_tests)]
-        # Sort the list to give a predictable order.
-        filenames.sort()
-        for filename in filenames:
-            path = os.path.join(tests_path, filename)
-            one_test = LayeredDocFileSuite(
-                path, package=package, setUp=setUp, tearDown=tearDown,
-                layer=layer, stdout_logging_level=logging.WARNING
-                )
-            suite.addTest(one_test)
-
+    suite.addTest(build_doctest_suite(base_dir, tests_path, special_tests,
+                                      layer, setUp, tearDown, package))
     return suite

=== modified file 'lib/lp/testing/_webservice.py'
--- lib/lp/testing/_webservice.py	2010-04-15 20:37:59 +0000
+++ lib/lp/testing/_webservice.py	2010-04-25 14:29:32 +0000
@@ -8,7 +8,7 @@
 __all__ = [
     'launchpadlib_credentials_for',
     'launchpadlib_for',
-    'oauth_access_token_for'
+    'oauth_access_token_for',
     ]
 
 from zope.component import getUtility
@@ -22,6 +22,7 @@
 
 from lp.testing._login import login, logout
 
+
 def oauth_access_token_for(consumer_name, person, permission, context=None):
     """Find or create an OAuth access token for the given person.
     :param consumer_name: An OAuth consumer name.