Launchpad itself

Merge ~pappacena/launchpad:fix-flags-for-oci-recipe-init into launchpad:master

  1. Git
  2. lp:~pappacena/launchpad
  3. fix-flags-for-oci-recipe-init
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: 94b12cbfd076031eb79b712f02aeaeb1a0945f51
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:fix-flags-for-oci-recipe-init
Merge into: launchpad:master
Diff against target: 54 lines (+10/-2)
2 files modified
lib/lp/archiveuploader/tests/test_ocirecipeupload.py (+4/-1)
lib/lp/oci/tests/test_ocirecipebuildjob.py (+6/-1)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+381598@code.launchpad.net

Commit message

Adding the feature flag to enable OCI Recipe creation in some more tests to fix them.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archiveuploader/tests/test_ocirecipeupload.py b/lib/lp/archiveuploader/tests/test_ocirecipeupload.py
2index d80be3a..bae4f4a 100644
3--- a/lib/lp/archiveuploader/tests/test_ocirecipeupload.py
4+++ b/lib/lp/archiveuploader/tests/test_ocirecipeupload.py
5@@ -20,14 +20,17 @@ from lp.archiveuploader.uploadprocessor import (
6 UploadStatusEnum,
7 )
8 from lp.buildmaster.enums import BuildStatus
9-from lp.services.propertycache import get_property_cache
10+from lp.oci.interfaces.ocirecipe import OCI_RECIPE_ALLOW_CREATE
11+from lp.services.features.testing import FeatureFixture
12 from lp.services.osutils import write_file
13+from lp.services.propertycache import get_property_cache
14
15
16 class TestOCIRecipeUploads(TestUploadProcessorBase):
17
18 def setUp(self):
19 super(TestOCIRecipeUploads, self).setUp()
20+ self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
21
22 self.setupBreezy()
23
24diff --git a/lib/lp/oci/tests/test_ocirecipebuildjob.py b/lib/lp/oci/tests/test_ocirecipebuildjob.py
25index 2b2d45c..cf85684 100644
26--- a/lib/lp/oci/tests/test_ocirecipebuildjob.py
27+++ b/lib/lp/oci/tests/test_ocirecipebuildjob.py
28@@ -7,13 +7,14 @@ from __future__ import absolute_import, print_function, unicode_literals
29
30 __metaclass__ = type
31
32-
33+from lp.oci.interfaces.ocirecipe import OCI_RECIPE_ALLOW_CREATE
34 from lp.oci.interfaces.ocirecipebuildjob import IOCIRecipeBuildJob
35 from lp.oci.model.ocirecipebuildjob import (
36 OCIRecipeBuildJob,
37 OCIRecipeBuildJobDerived,
38 OCIRecipeBuildJobType,
39 )
40+from lp.services.features.testing import FeatureFixture
41 from lp.testing import TestCaseWithFactory
42 from lp.testing.layers import DatabaseFunctionalLayer
43
44@@ -26,6 +27,10 @@ class TestOCIRecipeBuildJob(TestCaseWithFactory):
45
46 layer = DatabaseFunctionalLayer
47
48+ def setUp(self):
49+ super(TestOCIRecipeBuildJob, self).setUp()
50+ self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
51+
52 def test_provides_interface(self):
53 oci_build = self.factory.makeOCIRecipeBuild()
54 self.assertProvides(