launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/launchpad:oci-buildbehaviour into launchpad:master.

Commit message:
Swap TrialTestCase for TestCaseWithFactory

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Buildbot appears to have an irreproducible test failure in  lp.oci.tests.test_ocirecipebuildbehaviour.TestGetUploadMethodsForOCIRecipeBuild.test_getUploadDirLeafCookie_parseable

The snapbuildbehaviour version of this test uses TestCaseWithFactory, so try that instead.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:oci-buildbehaviour into launchpad:master.

diff --git a/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py b/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
index e9ac224..4132179 100644
--- a/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
+++ b/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
@@ -596,9 +596,5 @@ class TestHandleStatusForOCIRecipeBuild(MakeOCIBuildMixin, TrialTestCase,
 
 
 class TestGetUploadMethodsForOCIRecipeBuild(
-    MakeOCIBuildMixin, TestGetUploadMethodsMixin, TrialTestCase):
+    MakeOCIBuildMixin, TestGetUploadMethodsMixin, TestCaseWithFactory):
     """IPackageBuild.getUpload-related methods work with OCI recipe builds."""
-
-    def setUp(self):
-        super(TestGetUploadMethodsForOCIRecipeBuild, self).__init__(self)
-        self.factory = LaunchpadObjectFactory()