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

[Colin Watson]

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

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

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'constraints.txt'
--- constraints.txt	2018-02-26 14:16:17 +0000
+++ constraints.txt	2018-03-30 10:11:02 +0000
@@ -348,7 +348,7 @@
 timeline==0.0.3
 Twisted[conch,tls]==16.5.0
 txAMQP==0.6.2
-txfixtures==0.4.1
+txfixtures==0.4.2
 txlongpoll==0.2.12
 txlongpollfixture==0.1.3
 txpkgupload==0.2
 
=== modified file 'lib/lp/services/daemons/tests/test_tachandler.py'
--- lib/lp/services/daemons/tests/test_tachandler.py	2014-04-25 12:31:15 +0000
+++ lib/lp/services/daemons/tests/test_tachandler.py	2018-03-30 10:11:02 +0000
@@ -108,11 +108,8 @@
     def test_missingTac(self):
         """TacTestSetup raises TacException if the tacfile doesn't exist"""
         fixture = SimpleTac("missing", "/file/does/not/exist")
-        try:
-            self.assertRaises(TacException, fixture.setUp)
-            self.assertThat(fixture, Not(IsRunning()))
-        finally:
-            fixture.cleanUp()
+        self.assertRaises(TacException, fixture.setUp)
+        self.assertThat(fixture, Not(IsRunning()))
 
     def test_couldNotListenTac(self):
         """If the tac fails due to not being able to listen on the needed
@@ -120,11 +117,8 @@
         """
         tempdir = self.useFixture(TempDir()).path
         fixture = SimpleTac("cannotlisten", tempdir)
-        try:
-            self.assertRaises(TacException, fixture.setUp)
-            self.assertThat(fixture, Not(IsRunning()))
-        finally:
-            fixture.cleanUp()
+        self.assertRaises(TacException, fixture.setUp)
+        self.assertThat(fixture, Not(IsRunning()))
 
     def test_stalePidFile(self):
         """TacTestSetup complains about stale pid files."""
@@ -142,11 +136,8 @@
 
         # Fire up the fixture, capturing warnings.
         with warnings.catch_warnings(record=True) as warnings_log:
-            try:
-                self.assertRaises(TacException, fixture.setUp)
-                self.assertThat(fixture, Not(IsRunning()))
-            finally:
-                fixture.cleanUp()
+            self.assertRaises(TacException, fixture.setUp)
+            self.assertThat(fixture, Not(IsRunning()))
 
         # One deprecation warning is emitted.
         self.assertEqual(