Launchpad itself

Merge lp:~frankban/launchpad/bug-609986-add-zope.testing-3.9.4-p5 into lp:launchpad

  1. bug-609986-add-zope.testing-3.9.4-p5
  2. Merge into devel
Proposed by Francesco Banconi on 2012-03-27
Status: Merged
Approved by: Gary Poster on 2012-03-27
Approved revision: no longer in the source branch.
Merged at revision: 15044
Proposed branch: lp:~frankban/launchpad/bug-609986-add-zope.testing-3.9.4-p5
Merge into: lp:launchpad
Diff against target: 43 lines (+7/-3)
3 files modified
bzrplugins/lpserve/test_lpserve.py (+2/-1)
lib/lp/services/job/tests/test_runner.py (+3/-1)
versions.cfg (+2/-1)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-609986-add-zope.testing-3.9.4-p5
Reviewer Review Type Date Requested Status
Gary Poster (community) 2012-03-27 Approve on 2012-03-29
Review via email: mp+99536@code.launchpad.net

Description of the Change

Added the new version of zope.testing that fixes bug #609986

To post a comment you must log in.
Gary Poster (gary) :
review: Approve
Gary Poster (gary) wrote :

Approving the test disabling, per discussion. Thank you

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrplugins/lpserve/test_lpserve.py'
2--- bzrplugins/lpserve/test_lpserve.py 2012-01-01 03:20:03 +0000
3+++ bzrplugins/lpserve/test_lpserve.py 2012-03-30 09:00:28 +0000
4@@ -604,7 +604,8 @@
5 def test_sigterm_exits_nicely(self):
6 self._check_exits_nicely(signal.SIGTERM)
7
8- def test_sigint_exits_nicely(self):
9+ def disable_test_sigint_exits_nicely(self):
10+ # XXX: frankban 2012-03-29 bug=828584: This test fails intermittently.
11 self._check_exits_nicely(signal.SIGINT)
12
13 def test_child_exits_eventually(self):
14
15=== modified file 'lib/lp/services/job/tests/test_runner.py'
16--- lib/lp/services/job/tests/test_runner.py 2012-03-28 11:36:07 +0000
17+++ lib/lp/services/job/tests/test_runner.py 2012-03-30 09:00:28 +0000
18@@ -612,8 +612,10 @@
19 self.assertEqual(
20 (2, 0), (len(runner.completed_jobs), len(runner.incomplete_jobs)))
21
22- def test_memory_hog_job(self):
23+ def disable_test_memory_hog_job(self):
24 """A job with a memory limit will trigger MemoryError on excess."""
25+ # XXX: frankban 2012-03-29 bug=963455: This test fails intermittently,
26+ # especially in parallel tests.
27 logger = BufferLogger()
28 logger.setLevel(logging.INFO)
29 runner = TwistedJobRunner.runFromSource(
30
31=== modified file 'versions.cfg'
32--- versions.cfg 2012-03-27 17:29:47 +0000
33+++ versions.cfg 2012-03-30 09:00:28 +0000
34@@ -280,7 +280,8 @@
35 # with 'new threads' in hudson/ec2 builds.
36 # p3 And always tear down layers, because thats the Right Thing To Do.
37 # p4 fixes --subunit --list to really just list the tests.
38-zope.testing = 3.9.4-p4
39+# p5 Build of lp:~launchpad/zope.testing/3.9.4-p5. Fixes bug #609986.
40+zope.testing = 3.9.4-p5
41 zope.thread = 3.4
42 zope.traversing = 3.8.0
43 zope.viewlet = 3.6.1