Launchpad itself

Merge ~twom/launchpad:oci-buildbehaviour into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. oci-buildbehaviour
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: c6202fd6f0b78c8e2a1e4783629e8a680e50374f
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:oci-buildbehaviour
Merge into: launchpad:master
Diff against target: 15 lines (+1/-5)
1 file modified
lib/lp/oci/tests/test_ocirecipebuildbehaviour.py (+1/-5)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+380154@code.launchpad.net

Commit message

Swap TrialTestCase for TestCaseWithFactory

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py b/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
2index e9ac224..4132179 100644
3--- a/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
4+++ b/lib/lp/oci/tests/test_ocirecipebuildbehaviour.py
5@@ -596,9 +596,5 @@ class TestHandleStatusForOCIRecipeBuild(MakeOCIBuildMixin, TrialTestCase,
6
7
8 class TestGetUploadMethodsForOCIRecipeBuild(
9- MakeOCIBuildMixin, TestGetUploadMethodsMixin, TrialTestCase):
10+ MakeOCIBuildMixin, TestGetUploadMethodsMixin, TestCaseWithFactory):
11 """IPackageBuild.getUpload-related methods work with OCI recipe builds."""
12-
13- def setUp(self):
14- super(TestGetUploadMethodsForOCIRecipeBuild, self).__init__(self)
15- self.factory = LaunchpadObjectFactory()

Subscribers

People subscribed via source and target branches

to status/vote changes: