Launchpad itself

Merge lp:~cjwatson/launchpad/txfixtures-0.4.2 into lp:launchpad

  1. txfixtures-0.4.2
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18604
Proposed branch: lp:~cjwatson/launchpad/txfixtures-0.4.2
Merge into: lp:launchpad
Diff against target: 58 lines (+7/-16)
2 files modified
constraints.txt (+1/-1)
lib/lp/services/daemons/tests/test_tachandler.py (+6/-15)
To merge this branch: bzr merge lp:~cjwatson/launchpad/txfixtures-0.4.2
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+342444@code.launchpad.net

Commit message

Upgrade to txfixtures 0.4.2, fixing occasional test failures on buildbot.

Description of the change

See https://github.com/testing-cabal/txfixtures/pull/9/commits/4b7877c07b370afff3d16761cf9b6ba70e166f7b for the rationale for the test changes.

To post a comment you must log in.
Revision history for this message
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 'constraints.txt'
2--- constraints.txt 2018-02-26 14:16:17 +0000
3+++ constraints.txt 2018-03-30 10:11:02 +0000
4@@ -348,7 +348,7 @@
5 timeline==0.0.3
6 Twisted[conch,tls]==16.5.0
7 txAMQP==0.6.2
8-txfixtures==0.4.1
9+txfixtures==0.4.2
10 txlongpoll==0.2.12
11 txlongpollfixture==0.1.3
12 txpkgupload==0.2
13
14=== modified file 'lib/lp/services/daemons/tests/test_tachandler.py'
15--- lib/lp/services/daemons/tests/test_tachandler.py 2014-04-25 12:31:15 +0000
16+++ lib/lp/services/daemons/tests/test_tachandler.py 2018-03-30 10:11:02 +0000
17@@ -108,11 +108,8 @@
18 def test_missingTac(self):
19 """TacTestSetup raises TacException if the tacfile doesn't exist"""
20 fixture = SimpleTac("missing", "/file/does/not/exist")
21- try:
22- self.assertRaises(TacException, fixture.setUp)
23- self.assertThat(fixture, Not(IsRunning()))
24- finally:
25- fixture.cleanUp()
26+ self.assertRaises(TacException, fixture.setUp)
27+ self.assertThat(fixture, Not(IsRunning()))
28
29 def test_couldNotListenTac(self):
30 """If the tac fails due to not being able to listen on the needed
31@@ -120,11 +117,8 @@
32 """
33 tempdir = self.useFixture(TempDir()).path
34 fixture = SimpleTac("cannotlisten", tempdir)
35- try:
36- self.assertRaises(TacException, fixture.setUp)
37- self.assertThat(fixture, Not(IsRunning()))
38- finally:
39- fixture.cleanUp()
40+ self.assertRaises(TacException, fixture.setUp)
41+ self.assertThat(fixture, Not(IsRunning()))
42
43 def test_stalePidFile(self):
44 """TacTestSetup complains about stale pid files."""
45@@ -142,11 +136,8 @@
46
47 # Fire up the fixture, capturing warnings.
48 with warnings.catch_warnings(record=True) as warnings_log:
49- try:
50- self.assertRaises(TacException, fixture.setUp)
51- self.assertThat(fixture, Not(IsRunning()))
52- finally:
53- fixture.cleanUp()
54+ self.assertRaises(TacException, fixture.setUp)
55+ self.assertThat(fixture, Not(IsRunning()))
56
57 # One deprecation warning is emitted.
58 self.assertEqual(