launchpad-reviewers team mailing list archive

[Colin Watson <mp+424195@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-disabled-cronscript-metrics into launchpad:master.

Commit message:
Fix doctests following LaunchpadCronScript changes

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/424195

After commit f7ccf54b16, output from cron script startup happens in a slightly different order, causing some doctests to fail.  Fix these.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-disabled-cronscript-metrics into launchpad:master.

diff --git a/lib/lp/bugs/doc/bugnotification-sending.txt b/lib/lp/bugs/doc/bugnotification-sending.txt
index a3d7b8f..bccc3b2 100644
--- a/lib/lp/bugs/doc/bugnotification-sending.txt
+++ b/lib/lp/bugs/doc/bugnotification-sending.txt
@@ -539,7 +539,7 @@ makes it write out the emails it sends.
     >>> process.returncode
     0
     >>> print(err)
-    DEBUG   ...
+    INFO    ...
     INFO    Notifying test@xxxxxxxxxxxxx about bug 2.
     ...
     From: Sample Person <...@bugs.launchpad.net>
diff --git a/lib/lp/bugs/doc/checkwatches-cli-switches.txt b/lib/lp/bugs/doc/checkwatches-cli-switches.txt
index 79873ac..9202f7b 100644
--- a/lib/lp/bugs/doc/checkwatches-cli-switches.txt
+++ b/lib/lp/bugs/doc/checkwatches-cli-switches.txt
@@ -69,7 +69,6 @@ line.
     >>> run_cronscript_with_args([
     ...     '--bug-tracker=mozilla.org', '--bug-tracker=debbugs', '-v',
     ...     '--batch-size=10'])
-    DEBUG Enabled by DEFAULT section
     DEBUG Using a global batch size of 10
     DEBUG No watches to update on https://bugzilla.mozilla.org/
     DEBUG No watches to update on http://bugs.debian.org
@@ -99,7 +98,6 @@ demonstrate this.
     ...         bug_watch.lastchecked = datetime.now(pytz.timezone('UTC'))
 
     >>> run_cronscript_with_args(['-vvt', 'savannah', '--reset'])
-    DEBUG Enabled by DEFAULT section
     INFO Resetting 5 bug watches for bug tracker 'savannah'
     INFO Updating 5 watches on bug tracker 'savannah'
     INFO 'Unsupported Bugtracker' error updating http://savannah.gnu.org/:
diff --git a/lib/lp/bugs/doc/sourceforge-remote-products.txt b/lib/lp/bugs/doc/sourceforge-remote-products.txt
index edd70ce..befa82b 100644
--- a/lib/lp/bugs/doc/sourceforge-remote-products.txt
+++ b/lib/lp/bugs/doc/sourceforge-remote-products.txt
@@ -162,7 +162,7 @@ remote_product fields.
     0
 
     >>> print(err)
-    DEBUG   ...
+    INFO    ...
     INFO    No Products to update.
     INFO    Time for this run: ... seconds.
     DEBUG   updateremoteproduct ran in ...s (excl. load & lock)
diff --git a/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt b/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
index 92a08af..933c880 100644
--- a/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
+++ b/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
@@ -657,8 +657,8 @@ files that are published in the sample data.
     >>> import transaction
     >>> transaction.commit()
     >>> run_publish_distro(careful=True)
-    DEBUG   Enabled by DEFAULT section
     INFO    Creating lockfile: ...
+    DEBUG   Enabled by DEFAULT section
     DEBUG   Distribution: ubuntutest
     ...
     DEBUG   Added
@@ -691,8 +691,8 @@ Check that breezy-autotest is skipped, to ensure that changes to what's
 uploaded in the test above don't break the assumptions of this test.
 
     >>> run_publish_distro(careful_publishing=True)
-    DEBUG   Enabled by DEFAULT section
     INFO    Creating lockfile: ...
+    DEBUG   Enabled by DEFAULT section
     DEBUG   Distribution: ubuntutest
     ...
     DEBUG   /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb
diff --git a/lib/lp/translations/doc/poexport-request.txt b/lib/lp/translations/doc/poexport-request.txt
index 5aee787..1dc9a04 100644
--- a/lib/lp/translations/doc/poexport-request.txt
+++ b/lib/lp/translations/doc/poexport-request.txt
@@ -254,8 +254,8 @@ The script is run.
     ...     )
     >>> (output, empty) = process.communicate()
     >>> print(output)
-    DEBUG   ...
     INFO    Creating lockfile: /var/lock/launchpad-rosetta-export-queue.lock
+    DEBUG   ...
     DEBUG   Exporting objects for Happy Downloader, related to template
     evolution-2.2 in Evolution trunk
     DEBUG   Exporting objects for Happy Downloader, related to template