Merge lp:~mbruzek/charms/trusty/tomcat/addtimetests into lp:charms/trusty/tomcat

Proposed by Matt Bruzek
Status: Merged
Merged at revision: 14
Proposed branch: lp:~mbruzek/charms/trusty/tomcat/addtimetests
Merge into: lp:charms/trusty/tomcat
Diff against target: 12 lines (+1/-1)
1 file modified
tests/10-configured-deploy.py (+1/-1)
To merge this branch: bzr merge lp:~mbruzek/charms/trusty/tomcat/addtimetests
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Review via email: mp+237920@code.launchpad.net

Description of the change

I added some additional 5 minutes to make the local tests not time out.

$ bundletester -F -e local
INFO:root:Bootstapping Juju Environment...
INFO:deployer.env:bootstraping, this might take a while...
INFO:deployer.env: Bootstrap complete
tomcat
    charm-proof PASS
    00-setup PASS
    10-configured-deploy.py PASS

PASS: 3 Total: 3 (896.293607 sec)

To post a comment you must log in.
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM

THanks Matt

PASS: 3 Total: 3 (511.595527 sec)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/10-configured-deploy.py'
2--- tests/10-configured-deploy.py 2014-03-21 14:37:15 +0000
3+++ tests/10-configured-deploy.py 2014-10-10 09:05:08 +0000
4@@ -9,7 +9,7 @@
5 import subprocess
6
7 # The number of seconds to wait for Juju to set up the environment.
8-seconds = 900
9+seconds = 1200
10 # The number of units to scale to.
11 scale = 2
12 # Get the directory in this way to load the files from the tests directory.

Subscribers

People subscribed via source and target branches

to all changes: