launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-improve-config-fixture into launchpad:master.

Commit message:
Fix TestSwiftFixture.test_shutdown_and_startup

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Now that shutting down SwiftFixture removes the corresponding items from the config (https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/404849), this test needs to take care to create the connection before shutting down the fixture.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-improve-config-fixture into launchpad:master.

diff --git a/lib/lp/testing/swift/tests/test_fixture.py b/lib/lp/testing/swift/tests/test_fixture.py
index 2fbc3eb..730de53 100644
--- a/lib/lp/testing/swift/tests/test_fixture.py
+++ b/lib/lp/testing/swift/tests/test_fixture.py
@@ -180,8 +180,8 @@ class TestSwiftFixture(TestCase):
         # With no Swift server, a fresh connection fails with
         # a swiftclient.ClientException when it fails to
         # authenticate.
-        self.swift_fixture.shutdown()
         client = self.swift_fixture.connect()
+        self.swift_fixture.shutdown()
         self.assertRaises(
             swiftclient.ClientException,
             client.get_object, "size", str(size))