Merge lp:~benji/launchpad/bug-1011793-2 into lp:launchpad

Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: no longer in the source branch.
Merged at revision: 15418
Proposed branch: lp:~benji/launchpad/bug-1011793-2
Merge into: lp:launchpad
Diff against target: 23 lines (+3/-1)
2 files modified
.bzrignore (+1/-1)
logs/README.txt (+2/-0)
To merge this branch: bzr merge lp:~benji/launchpad/bug-1011793-2
Reviewer Review Type Date Requested Status
Benji York (community) Approve
Review via email: mp+110338@code.launchpad.net

Commit message

Create the "logs" directory in the repo instead of depending on it being created as a side effect of starting Launchpad or running particular tests.

Description of the change

Bug 1011793 is about a test failing when run in parallel because the
"logs" directory doesn't exist. It turns out that the "logs" directory
gets created as a side effect of starting Launchpad or running
particular tests.

Instead, this branch simply creates the directory so development and
test environments won't have to depend on side effects. The code to
create the log directory -- especially for production -- has been left
alone because creating the directory as needed makes the most sense in
that situation.

Unfortunately I had a brain/bzr interface malfunction and removed the
logs directory after comitting an earlier fix. For that reason I will
be self-reviewing this MP.

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

Self review for reasons stated above.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-06-02 03:05:06 +0000
3+++ .bzrignore 2012-06-14 14:03:21 +0000
4@@ -1,6 +1,5 @@
5 .tags
6 bzr-version-info.py
7-logs
8 logs/*
9 +*
10 sourcecode/*
11@@ -78,3 +77,4 @@
12 callgrind.out.*
13 scripts/mlist-sync.py
14 ./celerybeat-schedule
15+!logs/README.txt
16
17=== added directory 'logs'
18=== added file 'logs/README.txt'
19--- logs/README.txt 1970-01-01 00:00:00 +0000
20+++ logs/README.txt 2012-06-14 14:03:21 +0000
21@@ -0,0 +1,2 @@
22+This directory is included in revision control so that it exists for
23+tests that need to write logs.