Launchpad itself

Merge ~pappacena/launchpad:testfix-recipe-index-buildpath into launchpad:master

  1. Git
  2. lp:~pappacena/launchpad
  3. testfix-recipe-index-buildpath
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: 4b05b86273ff6617ae9624338d1203ef788ab2bf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:testfix-recipe-index-buildpath
Merge into: launchpad:master
Diff against target: 27 lines (+3/-1)
1 file modified
lib/lp/oci/browser/tests/test_ocirecipe.py (+3/-1)
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+391753@code.launchpad.net

Commit message

Fixing test on OCI recipe index with build ARGs

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/oci/browser/tests/test_ocirecipe.py b/lib/lp/oci/browser/tests/test_ocirecipe.py
2index 2c435d6..72f9c83 100644
3--- a/lib/lp/oci/browser/tests/test_ocirecipe.py
4+++ b/lib/lp/oci/browser/tests/test_ocirecipe.py
5@@ -785,6 +785,7 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
6 recipe = self.makeOCIRecipe(
7 oci_project=oci_project, git_ref=ref, build_file="Dockerfile",
8 build_args={"VAR1": "123", "VAR2": "XXX"})
9+ build_path = recipe.build_path
10 build = self.makeBuild(
11 recipe=recipe, status=BuildStatus.FULLYBUILT,
12 duration=timedelta(minutes=30))
13@@ -797,12 +798,13 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
14 OCI project: %s
15 Source: ~test-person/\\+git/recipe-repository:master
16 Build file path: Dockerfile
17+ Build context directory: %s
18 Build schedule: Built on request
19 Build-time\nARG variables: VAR1=123 VAR2=XXX
20 Latest builds
21 Status When complete Architecture
22 Successfully built 30 minutes ago 386
23- """ % (oci_project_name, oci_project_display),
24+ """ % (oci_project_name, oci_project_display, build_path),
25 self.getMainText(build.recipe))
26
27 def test_index_success_with_buildlog(self):