Merge lp:~frankban/charms/trusty/redis/bundletester into lp:~juju-gui/charms/trusty/redis/trunk

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 4
Proposed branch: lp:~frankban/charms/trusty/redis/bundletester
Merge into: lp:~juju-gui/charms/trusty/redis/trunk
Diff against target: 25 lines (+6/-1)
2 files modified
Makefile (+5/-0)
tests/tests.yaml (+1/-1)
To merge this branch: bzr merge lp:~frankban/charms/trusty/redis/bundletester
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+261188@code.launchpad.net

Description of the change

Add support for bundletester.

QA:
make bundletester

https://codereview.appspot.com/245110043/

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Reviewers: mp+261188_code.launchpad.net,

Message:
Please take a look.

Description:
Add support for bundletester.

QA:
make bundletester

https://code.launchpad.net/~frankban/charms/trusty/redis/bundletester/+merge/261188

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/245110043/

Affected files (+8, -1 lines):
   M Makefile
   A [revision details]
   M tests/tests.yaml

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2015-05-27 07:41:36 +0000
+++ Makefile 2015-06-05 09:15:51 +0000
@@ -52,6 +52,11 @@
    (touch test-requirements.pip; exit 1)
   @touch $(VENV_ACTIVATE)

+.PHONY: bundletester
+bundletester: setup
+ $(PIP) install bundletester
+ $(VENV)/bin/bundletester -l DEBUG
+
  .PHONY: clean
  clean:
   -$(RM) -rfv $(VENV) .coverage

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: tests/tests.yaml
=== modified file 'tests/tests.yaml'
--- tests/tests.yaml 2015-05-21 17:28:02 +0000
+++ tests/tests.yaml 2015-06-05 09:15:51 +0000
@@ -1,4 +1,4 @@
-bootstrap: true
+bootstrap: false
  reset: false
  tests: "none"
  packages:

Revision history for this message
Martin Hilton (martin-hilton) wrote :
Revision history for this message
Jay R. Wren (evarlast) wrote :
Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Add support for bundletester.

QA:
make bundletester

R=martin.hilton, jay.wren
CC=
https://codereview.appspot.com/245110043

https://codereview.appspot.com/245110043/

Revision history for this message
Francesco Banconi (frankban) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-05-27 07:41:36 +0000
3+++ Makefile 2015-06-05 09:22:25 +0000
4@@ -52,6 +52,11 @@
5 (touch test-requirements.pip; exit 1)
6 @touch $(VENV_ACTIVATE)
7
8+.PHONY: bundletester
9+bundletester: setup
10+ $(PIP) install bundletester
11+ $(VENV)/bin/bundletester -l DEBUG
12+
13 .PHONY: clean
14 clean:
15 -$(RM) -rfv $(VENV) .coverage
16
17=== modified file 'tests/tests.yaml'
18--- tests/tests.yaml 2015-05-21 17:28:02 +0000
19+++ tests/tests.yaml 2015-06-05 09:22:25 +0000
20@@ -1,4 +1,4 @@
21-bootstrap: true
22+bootstrap: false
23 reset: false
24 tests: "none"
25 packages:

Subscribers

People subscribed via source and target branches