Merge lp:~tvansteenburgh/charms/precise/openstack-dashboard/fix-tests into lp:~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk

Proposed by Tim Van Steenburgh
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~tvansteenburgh/charms/precise/openstack-dashboard/fix-tests
Merge into: lp:~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk
Diff against target: 57 lines (+14/-2)
2 files modified
Makefile (+10/-2)
config.yaml (+4/-0)
To merge this branch: bzr merge lp:~tvansteenburgh/charms/precise/openstack-dashboard/fix-tests
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+234238@code.launchpad.net

Description of the change

Fix tests, proofs.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

defaults fixed in next; postponing virtualenv use until we have a broader team discussion.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2014-05-21 10:15:35 +0000
+++ Makefile 2014-09-11 01:22:32 +0000
@@ -5,9 +5,14 @@
5 @flake8 --exclude hooks/charmhelpers hooks unit_tests5 @flake8 --exclude hooks/charmhelpers hooks unit_tests
6 @charm proof6 @charm proof
77
8test:8test: .venv
9 @echo Starting tests...9 @echo Starting tests...
10 @$(PYTHON) /usr/bin/nosetests --nologcapture unit_tests10 .venv/bin/nosetests --nologcapture unit_tests
11
12.venv:
13 sudo apt-get install -y python-virtualenv python-apt
14 virtualenv .venv --system-site-packages
15 .venv/bin/pip install -I nose mock pyyaml
1116
12sync:17sync:
13 @charm-helper-sync -c charm-helpers-sync.yaml18 @charm-helper-sync -c charm-helpers-sync.yaml
@@ -15,3 +20,6 @@
15publish: lint test20publish: lint test
16 bzr push lp:charms/openstack-dashboard21 bzr push lp:charms/openstack-dashboard
17 bzr push lp:charms/trusty/openstack-dashboard22 bzr push lp:charms/trusty/openstack-dashboard
23
24clean:
25 rm -rf .venv
1826
=== modified file 'config.yaml'
--- config.yaml 2014-02-03 12:34:56 +0000
+++ config.yaml 2014-09-11 01:22:32 +0000
@@ -35,6 +35,7 @@
35 vip:35 vip:
36 type: string36 type: string
37 description: "Virtual IP to use to front openstack dashboard ha configuration"37 description: "Virtual IP to use to front openstack dashboard ha configuration"
38 default:
38 vip_iface:39 vip_iface:
39 type: string40 type: string
40 default: eth041 default: eth0
@@ -68,10 +69,12 @@
68 Swifts's entry in the Keystone catalog to use https, and override69 Swifts's entry in the Keystone catalog to use https, and override
69 any certficiate and key issued by Keystone (if it is configured to70 any certficiate and key issued by Keystone (if it is configured to
70 do so).71 do so).
72 default:
71 ssl_key:73 ssl_key:
72 type: string74 type: string
73 description: |75 description: |
74 Base64 encoded SSL key to use with certificate specified as ssl_cert.76 Base64 encoded SSL key to use with certificate specified as ssl_cert.
77 default:
75 offline-compression:78 offline-compression:
76 type: string79 type: string
77 default: "yes"80 default: "yes"
@@ -87,3 +90,4 @@
87 secret:90 secret:
88 type: string91 type: string
89 description: Secret for Horizon to use when securing internal data; set this when using multiple dashboard units.92 description: Secret for Horizon to use when securing internal data; set this when using multiple dashboard units.
93 default:

Subscribers

People subscribed via source and target branches