Merge lp:~jose/charms/precise/python-moinmoin/fix-tests into lp:charms/python-moinmoin

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 10
Proposed branch: lp:~jose/charms/precise/python-moinmoin/fix-tests
Merge into: lp:charms/python-moinmoin
Diff against target: 22 lines (+3/-3)
1 file modified
tests/01_deploy.test (+3/-3)
To merge this branch: bzr merge lp:~jose/charms/precise/python-moinmoin/fix-tests
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+234258@code.launchpad.net

Description of the change

Fixed 01 test in order for it to pass correctly (tested with AWS), and added a 00-setup.sh file.

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

+1 LGTM

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/01_deploy.test'
2--- tests/01_deploy.test 2012-03-02 02:30:38 +0000
3+++ tests/01_deploy.test 2014-09-11 06:58:17 +0000
4@@ -5,7 +5,7 @@
5 exit 100
6 fi
7
8-set -e
9+set -ex
10
11 teardown() {
12 juju destroy-service python-moinmoin
13@@ -21,8 +21,8 @@
14 trap teardown EXIT
15
16
17-juju deploy python-moinmoin
18-juju deploy haproxy
19+juju deploy cs:precise/python-moinmoin
20+juju deploy cs:precise/haproxy
21 juju add-relation haproxy:reverseproxy python-moinmoin:website
22 juju expose haproxy
23

Subscribers

People subscribed via source and target branches

to all changes: