Merge lp:~michael.nelson/launchpad/db-enable-buildd-slavescanner.txt into lp:launchpad/db-devel

[Michael Nelson]

Re-enable buildd-slave.txt and buildd-slavescanner.txt doctests.

This branch re-enables two soyuz doctests.

The first, buildd-slavescanner.txt was disabled just this morning: bug 572005
It turned out the fix was simply removing a stray '...' and applying part of the devel change that was missed during the conflict resolution (see the notes on the bug).

The second, buildd-slave.txt was disabled last cycle due to intermittent failures: bug 553259.
I re-enabled the test, and just ensured that the intermittent test failure is not triggered by generalising the expected error so that it will pass whether the tachandler dies quickly or slowly (see bug for reason and an example of the intermittent failure).

To test:
$ bin/test -vvt doc/buildd-slave

[Abel Deuring (adeuring)]

review: Approve (code)

[Björn Tillenius (bjornt)]

review: Approve (release-critical)

=== renamed file 'lib/lp/soyuz/doc/buildd-slave.txt.disabled' => 'lib/lp/soyuz/doc/buildd-slave.txt'
--- lib/lp/soyuz/doc/buildd-slave.txt.disabled	2010-04-22 18:53:09 +0000
+++ lib/lp/soyuz/doc/buildd-slave.txt	2010-04-30 10:09:35 +0000
@@ -94,4 +94,4 @@
   >>> s.info()
   Traceback (most recent call last):
   ...
-  error: ...Connection refused...
+  error: ...

=== renamed file 'lib/lp/soyuz/doc/buildd-slavescanner.txt.disabled' => 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt.disabled	2010-04-30 03:10:17 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-04-30 10:09:35 +0000
@@ -383,12 +383,11 @@
      * Build Log: http://.../...i386.mozilla-firefox_0.9_NEEDSBUILD.txt.gz
     ...
     Upload log:
-    ...
-	DEBUG: Beginning processing
+    DEBUG: Beginning processing
     ...
     DEBUG: Moving upload directory /var/tmp/builddmaster/incoming/...
     ... to /var/tmp/builddmaster/failed/...
-	...
+    ...
 
 When a failure in processing the generated binaries occurs, the log
 output is both emailed in an immediate notification, and stored in the
@@ -620,22 +619,6 @@
     >>> len(failed_uploads)
     2
 
-    >>> failed_upload = failed_uploads[0]
-    >>> uploader_log = open(os.path.join(failed_dir, failed_upload,
-    ...                                  'uploader.log'))
-
-    >>> print uploader_log.read()
-    INFO    Creating lockfile: /var/lock/process-upload-buildd.lock
-    DEBUG   Initialising connection.
-    DEBUG   Beginning processing
-    DEBUG   Creating directory /var/tmp/builddmaster/accepted
-    DEBUG   Creating directory /var/tmp/builddmaster/rejected
-    DEBUG   Creating directory /var/tmp/builddmaster/failed
-    ...
-    DEBUG   Rolling back any remaining transactions.
-    DEBUG   Removing lock file: /var/lock/process-upload-buildd.lock
-    <BLANKLINE>
-
 Remove build upload results root
 
     >>> shutil.rmtree(config.builddmaster.root)

=== modified file 'lib/lp/soyuz/tests/test_doc.py'
--- lib/lp/soyuz/tests/test_doc.py	2010-04-30 03:10:17 +0000
+++ lib/lp/soyuz/tests/test_doc.py	2010-04-30 10:09:35 +0000
@@ -133,23 +133,18 @@
         setUp=builddmasterSetUp,
         layer=LaunchpadZopelessLayer,
         ),
-    # XXX Tim Penhey 2010-04-30 bug=572005
-    # Disabled as part of conflict resolution.
-    #'buildd-slavescanner.txt': LayeredDocFileSuite(
-    #    '../doc/buildd-slavescanner.txt',
-    #    setUp=builddmasterSetUp,
-    #    layer=LaunchpadZopelessLayer,
-    #    stdout_logging_level=logging.WARNING
-    #    ),
-    # XXX Michael Nelson 2010-04-01 bug=553259
-    # Disabling the buildd-slave.txt test until the
-    # timing issue is sorted (see bug).
-    # 'buildd-slave.txt': LayeredDocFileSuite(
-    #     '../doc/buildd-slave.txt',
-    #     setUp=setUp, tearDown=tearDown,
-    #     layer=LaunchpadZopelessLayer,
-    #     stdout_logging_level=logging.WARNING
-    #     ),
+    'buildd-slavescanner.txt': LayeredDocFileSuite(
+        '../doc/buildd-slavescanner.txt',
+        setUp=builddmasterSetUp,
+        layer=LaunchpadZopelessLayer,
+        stdout_logging_level=logging.WARNING
+        ),
+    'buildd-slave.txt': LayeredDocFileSuite(
+        '../doc/buildd-slave.txt',
+        setUp=setUp, tearDown=tearDown,
+        layer=LaunchpadZopelessLayer,
+        stdout_logging_level=logging.WARNING
+        ),
     'buildd-scoring.txt': LayeredDocFileSuite(
         '../doc/buildd-scoring.txt',
         setUp=builddmasterSetUp,