Launchpad itself

Merge lp:~thumper/launchpad/script-error-reporting-utility into lp:launchpad

  1. script-error-reporting-utility
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Merged at revision: 9693
Proposed branch: lp:~thumper/launchpad/script-error-reporting-utility
Merge into: lp:launchpad
Diff against target: 37 lines
2 files modified
lib/lp/code/model/tests/test_diff.py (+5/-0)
script.zcml (+5/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/script-error-reporting-utility
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+13329@code.launchpad.net

Commit message

Add configuration to register the error reporting utility for the scripts.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

A simple branch to add the error reporting utility configuration for our scripts.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

I think having one particular test duplicated between the different layers is silly -- can you divide the tests between the diff creating ones (should run in zopeless layer) and diff reading ones (should run in the functional layer)?

Otherwise fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py 2009-10-05 14:17:48 +0000
+++ lib/lp/code/model/tests/test_diff.py 2009-10-14 03:05:23 +0000
@@ -109,6 +109,11 @@
109 diff = self._create_diff(content)109 diff = self._create_diff(content)
110 self.assertTrue(diff.oversized)110 self.assertTrue(diff.oversized)
111111
112
113class TestDiffInScripts(DiffTestCase):
114
115 layer = LaunchpadZopelessLayer
116
112 def test_mergePreviewFromBranches(self):117 def test_mergePreviewFromBranches(self):
113 # mergePreviewFromBranches generates the correct diff.118 # mergePreviewFromBranches generates the correct diff.
114 bmp, source_rev_id, target_rev_id = self.createExampleMerge()119 bmp, source_rev_id, target_rev_id = self.createExampleMerge()
115120
=== modified file 'script.zcml'
--- script.zcml 2009-07-13 18:15:02 +0000
+++ script.zcml 2009-10-14 03:05:23 +0000
@@ -15,7 +15,7 @@
1515
16 <!-- package-includes/*-configure.zcml contains package configuration16 <!-- package-includes/*-configure.zcml contains package configuration
17 shared between a normal launchpad instance and the test suite.17 shared between a normal launchpad instance and the test suite.
18 package-includes/*-configure-normal.zcml and 18 package-includes/*-configure-normal.zcml and
19 package-includes/*-configure-testing.zcml contain configuration19 package-includes/*-configure-testing.zcml contain configuration
20 that needs to be different between normal and test modes.20 that needs to be different between normal and test modes.
21 -->21 -->
@@ -31,4 +31,8 @@
31 scripts which would be bad31 scripts which would be bad
32 -->32 -->
33 <!-- <includeOverrides file="override-configure-normal.zcml" /> -->33 <!-- <includeOverrides file="override-configure-normal.zcml" /> -->
34 <!-- Make sure that the scripts have access to to the error
35 reporting utility.
36 -->
37 <includeOverrides file="override-includes/errorlog-configure.zcml" />
34</configure>38</configure>