Merge lp://staging/~frankban/charms/trusty/redis/bundletester into lp://staging/~juju-gui/charms/trusty/redis/trunk
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 4 |
Proposed branch: | lp://staging/~frankban/charms/trusty/redis/bundletester |
Merge into: | lp://staging/~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://staging/~frankban/charms/trusty/redis/bundletester |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+261188@code.staging.launchpad.net |
Description of the change
To post a comment you must log in.
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/bundletes ter/+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 ts.pip; exit 1)
=== 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-requiremen
@touch $(VENV_ACTIVATE)
+.PHONY: bundletester /bin/bundletest er -l DEBUG
+bundletester: setup
+ $(PIP) install bundletester
+ $(VENV)
+
.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: