Launchpad itself

Merge ~twom/launchpad:oci-test-fix-browser-path into launchpad:master

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

Commit message

[TestFix] UI test fixes for build_path

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/browser/tests/test_ocirecipe.py b/lib/lp/oci/browser/tests/test_ocirecipe.py
2index c854d14..8dde5fc 100644
3--- a/lib/lp/oci/browser/tests/test_ocirecipe.py
4+++ b/lib/lp/oci/browser/tests/test_ocirecipe.py
5@@ -209,7 +209,10 @@ class TestOCIRecipeAddView(BaseTestOCIRecipeView):
6 "Source:\n%s\nEdit OCI recipe" % source_display,
7 MatchesTagText(content, "source"))
8 self.assertThat(
9- "Build file path:\nDockerfile\nEdit OCI recipe",
10+ "Build file path:\nDockerfile\n"
11+ "Edit OCI recipe\n"
12+ "Build context directory:\n.\n"
13+ "Edit OCI recipe",
14 MatchesTagText(content, "build-file"))
15 self.assertThat(
16 "Build schedule:\nBuilt on request\nEdit OCI recipe\n",
17@@ -385,6 +388,7 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
18 new_git_ref.repository.identity)
19 browser.getControl("Git branch").value = new_git_ref.path
20 browser.getControl("Build file path").value = "Dockerfile-2"
21+ browser.getControl("Build directory context").value = "apath"
22 browser.getControl("Build daily").selected = True
23 browser.getControl("Update OCI recipe").click()
24
25@@ -398,7 +402,10 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
26 "Source:\n%s\nEdit OCI recipe" % new_git_ref.display_name,
27 MatchesTagText(content, "source"))
28 self.assertThat(
29- "Build file path:\nDockerfile-2\nEdit OCI recipe",
30+ "Build file path:\nDockerfile-2\n"
31+ "Edit OCI recipe\n"
32+ "Build context directory:\napath\n"
33+ "Edit OCI recipe",
34 MatchesTagText(content, "build-file"))
35 self.assertThat(
36 "Build schedule:\nBuilt daily\nEdit OCI recipe\n",
37@@ -698,11 +705,12 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
38 OCI project: %s
39 Source: ~test-person/\\+git/recipe-repository:master
40 Build file path: Dockerfile
41+ Build context directory: %s
42 Build schedule: Built on request
43 Latest builds
44 Status When complete Architecture
45 Successfully built 30 minutes ago 386
46- """ % (oci_project_name, oci_project_display),
47+ """ % (oci_project_name, oci_project_display, recipe.build_path),
48 self.getMainText(build.recipe))
49
50 def test_index_success_with_buildlog(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: