Juju Charms Collection
python-django package

Merge lp:~codersquid/charms/precise/python-django/fix-test-branches into lp:charms/python-django

  1. Precise Pangolin (12.04)
  2. fix-test-branches
  3. Merge into trunk
Proposed by Sheila Miguez
Status: Merged
Merged at revision: 36
Proposed branch: lp:~codersquid/charms/precise/python-django/fix-test-branches
Merge into: lp:charms/python-django
Diff against target: 58 lines (+10/-5)
2 files modified
tests/00-setup (+5/-0)
tests/config/django.yaml (+5/-5)
To merge this branch: bzr merge lp:~codersquid/charms/precise/python-django/fix-test-branches
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+255214@code.launchpad.net

Description of the change

This fixes the incorrect branch names in the tests django.yaml file which was causing tests to fail. It also adds a 00-setup script which installs dependencies required to run the tests.

To post a comment you must log in.
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

+1 LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'tests/00-setup'
2--- tests/00-setup 1970-01-01 00:00:00 +0000
3+++ tests/00-setup 2015-04-03 20:56:14 +0000
4@@ -0,0 +1,5 @@
5+#!/bin/bash -e
6+
7+sudo apt-get install -qy \
8+ python3-yaml \
9+ curl
10
11=== modified file 'tests/config/django.yaml'
12--- tests/config/django.yaml 2014-11-19 17:34:34 +0000
13+++ tests/config/django.yaml 2015-04-03 20:56:14 +0000
14@@ -10,7 +10,7 @@
15 gunicorn:
16 charm: "cs:precise/gunicorn"
17 python-django:
18- branch: "lp:charmers/precise/python-django"
19+ branch: "lp:charms/precise/python-django"
20 charm: python-django
21 num_units: 1
22 options:
23@@ -32,7 +32,7 @@
24 gunicorn:
25 charm: "cs:precise/gunicorn"
26 python-django:
27- branch: "lp:charmers/precise/python-django"
28+ branch: "lp:charms/precise/python-django"
29 charm: python-django
30 num_units: 1
31 options:
32@@ -50,7 +50,7 @@
33 gunicorn:
34 charm: "cs:precise/gunicorn"
35 djangodistro:
36- branch: "lp:charmers/precise/python-django"
37+ branch: "lp:charms/precise/python-django"
38 charm: python-django
39 num_units: 1
40 options:
41@@ -67,7 +67,7 @@
42 gunicorn:
43 charm: "cs:precise/gunicorn"
44 django13:
45- branch: "lp:charmers/precise/python-django"
46+ branch: "lp:charms/precise/python-django"
47 charm: python-django
48 num_units: 1
49 options:
50@@ -85,7 +85,7 @@
51 gunicorn:
52 charm: "cs:precise/gunicorn"
53 django14:
54- branch: "lp:charmers/precise/python-django"
55+ branch: "lp:charms/precise/python-django"
56 charm: python-django
57 num_units: 1
58 options:

Subscribers

People subscribed via source and target branches

to all changes: