Landscape Charm

Merge lp:~ahasenack/landscape-charm/fix-fp-test-stable into lp:~landscape/landscape-charm/stable

  1. fix-fp-test-stable
  2. Merge into stable
Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 233
Merged at revision: 233
Proposed branch: lp:~ahasenack/landscape-charm/fix-fp-test-stable
Merge into: lp:~landscape/landscape-charm/stable
Diff against target: 12 lines (+1/-1)
1 file modified
tests/basic/test_service.py (+1/-1)
To merge this branch: bzr merge lp:~ahasenack/landscape-charm/fix-fp-test-stable
Reviewer Review Type Date Requested Status
Geoff Teale (community) Approve
Bogdana Vereha (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+304294@code.launchpad.net

Commit message

Change the text we look for in the unavailable page for something that's there from 16.06 onwards.

Description of the change

Change the text we look for in the unavailable page for something that's there from 16.06 onwards.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 233
Branch: lp:~ahasenack/landscape-charm/fix-fp-test-stable
Jenkins: https://ci.lscape.net/job/latch-test/9629/

review: Approve (test results)
Revision history for this message
Bogdana Vereha (bogdana) :
review: Approve
Revision history for this message
Geoff Teale (tealeg) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic/test_service.py'
2--- tests/basic/test_service.py 2016-04-07 20:54:07 +0000
3+++ tests/basic/test_service.py 2016-08-29 19:38:45 +0000
4@@ -92,7 +92,7 @@
5 Verify that the frontend shows the styled unavailable page.
6 """
7 self.environment.stop_landscape_service("landscape-appserver")
8- self.environment.check_url("/", "please phone us")
9+ self.environment.check_url("/", "Service will resume shortly")
10
11 def test_msg_unavailable_page(self):
12 """

Subscribers

People subscribed via source and target branches