Merge ~cjwatson/launchpad:ifp-logging-testfix-2 into launchpad:master

Proposed by Colin Watson on 2019-10-11
Status: Merged
Approved by: Colin Watson on 2019-10-11
Approved revision: 7f9337656ca7cc7683f65e8939fc43dcb28de610
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:ifp-logging-testfix-2
Merge into: launchpad:master
Diff against target: 27 lines (+8/-8)
1 file modified
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+8/-8)
Reviewer Review Type Date Requested Status
Colin Watson Approve on 2019-10-11
Review via email: mp+374029@code.launchpad.net

Commit message

Fix soyuz-set-of-uploads.txt further

Logging might be from something other than "root" depending on what
other tests have run.

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Self-approving another simple test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt b/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
2index 3aa8516..563cbc9 100644
3--- a/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
4+++ b/lib/lp/soyuz/doc/soyuz-set-of-uploads.txt
5@@ -91,14 +91,14 @@ for the ubuntutest distribution.
6 >>> breezy.previous_series = breezy_autotest
7 >>> ids = InitializeDistroSeries(breezy, [breezy_autotest.id])
8 >>> ids.initialize()
9- INFO:root:Setting distroseries parents.
10- INFO:root:Copying distroseries configuration from parents.
11- INFO:root:Copying distroarchseries from parents.
12- INFO:root:Setting nominated arch-indep configuration.
13- INFO:root:Copying packages from parents.
14- INFO:root:Copying packagesets from parents.
15- INFO:root:Copying permissions from parents.
16- INFO:root:Creating DistroSeriesDifferences.
17+ INFO:...:Setting distroseries parents.
18+ INFO:...:Copying distroseries configuration from parents.
19+ INFO:...:Copying distroarchseries from parents.
20+ INFO:...:Setting nominated arch-indep configuration.
21+ INFO:...:Copying packages from parents.
22+ INFO:...:Copying packagesets from parents.
23+ INFO:...:Copying permissions from parents.
24+ INFO:...:Creating DistroSeriesDifferences.
25 >>> breezy.changeslist = 'breezy-changes@ubuntu.com'
26 >>> fake_chroot = LibraryFileAlias.get(1)
27 >>> unused = breezy['i386'].addOrUpdateChroot(fake_chroot)

Subscribers

People subscribed via source and target branches