Merge lp:~gary/launchpad/small into lp:launchpad

[Gary Poster]

update a test to work with the new buildout approach. Problem only exhibited in some circumstances.

This branch updates a test to work with the new buildout approach: you only need to include parts/scripts in PYTHONPATH in order to get the dependencies included, and PYTHONPATH is in fact already set up for you. Before my branch, this test failed only under certain circumstances, which is why it was not caught earlier.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/scripts/tests/test_logger.txt'
--- lib/canonical/launchpad/scripts/tests/test_logger.txt	2009-06-12 16:36:02 +0000
+++ lib/canonical/launchpad/scripts/tests/test_logger.txt	2010-04-08 22:13:22 +0000
@@ -7,13 +7,12 @@
     ...     import sys
     ...     import subprocess
     ...     from canonical.config import config
-    ...     # We want to make sure that the subprocess will have the benefit
-    ...     # of all of the dependency paths inserted by the buildout.
-    ...     # We pass them via PYTHONPATH.
-    ...     env = kw.get('env')
-    ...     if env is None:
-    ...         kw['env'] = env = dict(os.environ)
-    ...     env['PYTHONPATH'] = os.path.pathsep.join(sys.path)
+    ...     if 'env' in kw:
+    ...         # We want to make sure that the subprocess will have the
+    ...         # benefit of all of the dependency paths inserted by the
+    ...         # buildout.  This is already set up in our environment's
+    ...         # PYTHONPATH, so use it.
+    ...         kw['env']['PYTHONPATH'] = os.environ['PYTHONPATH']
     ...     test_script_path = os.path.join(
     ...         config.root, 'lib', 'canonical', 'launchpad',
     ...         'scripts', 'tests', 'loglevels.py')