Launchpad itself

Merge lp:~stevenk/launchpad/re-enable-workermonitor into lp:launchpad

  1. re-enable-workermonitor
  2. Merge into devel
Proposed by Steve Kowalik on 2012-11-25
Status: Merged
Approved by: Steve Kowalik on 2012-11-25
Approved revision: no longer in the source branch.
Merged at revision: 16307
Proposed branch: lp:~stevenk/launchpad/re-enable-workermonitor
Merge into: lp:launchpad
Diff against target: 78 lines (+8/-18)
1 file modified
lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+8/-18)
To merge this branch: bzr merge lp:~stevenk/launchpad/re-enable-workermonitor
Reviewer Review Type Date Requested Status
William Grant code 2012-11-25 Approve on 2012-11-25
Review via email: mp+136072@code.launchpad.net

Commit Message

Raise TestWorkerMonitorIntegration's timeout to 60 seconds, and re-enable five of its tests.

Description of the Change

Raise the test timeout to 60 seconds, and re-enable the workermonitor tests.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
2--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2012-10-18 07:36:47 +0000
3+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2012-11-25 23:22:21 +0000
4@@ -5,8 +5,8 @@
5
6 __metaclass__ = type
7 __all__ = [
8- 'nuke_codeimport_sample_data']
9-
10+ 'nuke_codeimport_sample_data',
11+ ]
12
13 import os
14 import shutil
15@@ -669,7 +669,7 @@
16 class TestWorkerMonitorIntegration(BzrTestCase):
17
18 layer = ZopelessAppServerLayer
19- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=20)
20+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=60)
21
22 def setUp(self):
23 BzrTestCase.setUp(self)
24@@ -811,9 +811,7 @@
25
26 return deferred.addBoth(save_protocol_object)
27
28- # XXX 2011-09-05 wgrant, bug=841556: This test fails
29- # occasionally in buildbot.
30- def DISABLED_test_import_cvs(self):
31+ def test_import_cvs(self):
32 # Create a CVS CodeImport and import it.
33 job = self.getStartedJobForImport(self.makeCVSCodeImport())
34 code_import_id = job.code_import.id
35@@ -822,9 +820,7 @@
36 result = self.performImport(job_id)
37 return result.addCallback(self.assertImported, code_import_id)
38
39- # XXX 2011-09-05 wgrant, bug=841556: This test fails
40- # occasionally in buildbot.
41- def DISABLED_test_import_subversion(self):
42+ def test_import_subversion(self):
43 # Create a Subversion CodeImport and import it.
44 job = self.getStartedJobForImport(self.makeSVNCodeImport())
45 code_import_id = job.code_import.id
46@@ -833,9 +829,7 @@
47 result = self.performImport(job_id)
48 return result.addCallback(self.assertImported, code_import_id)
49
50- # XXX 2011-09-09 gary, bug=841556: This test fails
51- # occasionally in buildbot.
52- def DISABLED_test_import_git(self):
53+ def test_import_git(self):
54 # Create a Git CodeImport and import it.
55 job = self.getStartedJobForImport(self.makeGitCodeImport())
56 code_import_id = job.code_import.id
57@@ -844,9 +838,7 @@
58 result = self.performImport(job_id)
59 return result.addCallback(self.assertImported, code_import_id)
60
61- # XXX 2011-09-05 wgrant, bug=841556: This test fails
62- # occasionally in buildbot.
63- def DISABLED_test_import_bzr(self):
64+ def test_import_bzr(self):
65 # Create a Bazaar CodeImport and import it.
66 job = self.getStartedJobForImport(self.makeBzrCodeImport())
67 code_import_id = job.code_import.id
68@@ -855,9 +847,7 @@
69 result = self.performImport(job_id)
70 return result.addCallback(self.assertImported, code_import_id)
71
72- # XXX 2011-09-05 wgrant, bug=841556: This test fails
73- # frequently in buildbot.
74- def DISABLED_test_import_bzrsvn(self):
75+ def test_import_bzrsvn(self):
76 # Create a Subversion-via-bzr-svn CodeImport and import it.
77 job = self.getStartedJobForImport(self.makeBzrSvnCodeImport())
78 code_import_id = job.code_import.id