launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:txfixtures-0.4.3 into launchpad:master.

Commit message:
Upgrade to txfixtures 0.4.3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/379456

This should fix various unreliable tests caused by TacTestFixture.cleanUp not waiting for the daemon to die.

I removed some workarounds for the old behaviour; see https://bugs.launchpad.net/txfixtures/+bug/1222711.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/379455
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:txfixtures-0.4.3 into launchpad:master.

diff --git a/constraints.txt b/constraints.txt
index fd3a3a2..34630e1 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -300,7 +300,7 @@ timeline==0.0.7
 treq==18.6.0
 Twisted==19.2.1
 txAMQP==0.6.2
-txfixtures==0.4.2
+txfixtures==0.4.3
 txpkgupload==0.2
 van.testing==3.0.0
 vine==1.1.4
diff --git a/lib/lp/services/librarianserver/tests/test_swift.py b/lib/lp/services/librarianserver/tests/test_swift.py
index 515fc7f..f9ade6d 100644
--- a/lib/lp/services/librarianserver/tests/test_swift.py
+++ b/lib/lp/services/librarianserver/tests/test_swift.py
@@ -44,7 +44,7 @@ class TestFeedSwift(TestCase):
 
         # Restart the Librarian so it picks up the OS_* environment
         # variables.
-        LibrarianLayer.librarian_fixture.killTac()
+        LibrarianLayer.librarian_fixture.cleanUp()
         LibrarianLayer.librarian_fixture.setUp()
 
         # Add some files. These common sample files all have their
@@ -65,7 +65,7 @@ class TestFeedSwift(TestCase):
         super(TestFeedSwift, self).tearDown()
         # Restart the Librarian so it picks up the feature flag change.
         self.attachLibrarianLog(LibrarianLayer.librarian_fixture)
-        LibrarianLayer.librarian_fixture.killTac()
+        LibrarianLayer.librarian_fixture.cleanUp()
         LibrarianLayer.librarian_fixture.setUp()
 
     @write_transaction
diff --git a/lib/lp/testing/swift/fixture.py b/lib/lp/testing/swift/fixture.py
index 43fd988..e6ea41b 100644
--- a/lib/lp/testing/swift/fixture.py
+++ b/lib/lp/testing/swift/fixture.py
@@ -11,7 +11,6 @@ import shutil
 import socket
 import tempfile
 from textwrap import dedent
-import time
 
 from fixtures import FunctionFixture
 from swiftclient import client as swiftclient
@@ -100,6 +99,4 @@ class SwiftFixture(TacTestFixture):
         self.setUp()
 
     def shutdown(self):
-        self.killTac()
-        while self._hasDaemonStarted():
-            time.sleep(0.1)
+        self.cleanUp()