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

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
=== added file 'tests/00-setup'
--- tests/00-setup 1970-01-01 00:00:00 +0000
+++ tests/00-setup 2015-04-03 20:56:14 +0000
@@ -0,0 +1,5 @@
1#!/bin/bash -e
2
3sudo apt-get install -qy \
4 python3-yaml \
5 curl
06
=== modified file 'tests/config/django.yaml'
--- tests/config/django.yaml 2014-11-19 17:34:34 +0000
+++ tests/config/django.yaml 2015-04-03 20:56:14 +0000
@@ -10,7 +10,7 @@
10 gunicorn:10 gunicorn:
11 charm: "cs:precise/gunicorn"11 charm: "cs:precise/gunicorn"
12 python-django:12 python-django:
13 branch: "lp:charmers/precise/python-django"13 branch: "lp:charms/precise/python-django"
14 charm: python-django14 charm: python-django
15 num_units: 115 num_units: 1
16 options:16 options:
@@ -32,7 +32,7 @@
32 gunicorn:32 gunicorn:
33 charm: "cs:precise/gunicorn"33 charm: "cs:precise/gunicorn"
34 python-django:34 python-django:
35 branch: "lp:charmers/precise/python-django"35 branch: "lp:charms/precise/python-django"
36 charm: python-django36 charm: python-django
37 num_units: 137 num_units: 1
38 options:38 options:
@@ -50,7 +50,7 @@
50 gunicorn:50 gunicorn:
51 charm: "cs:precise/gunicorn"51 charm: "cs:precise/gunicorn"
52 djangodistro:52 djangodistro:
53 branch: "lp:charmers/precise/python-django"53 branch: "lp:charms/precise/python-django"
54 charm: python-django54 charm: python-django
55 num_units: 155 num_units: 1
56 options:56 options:
@@ -67,7 +67,7 @@
67 gunicorn:67 gunicorn:
68 charm: "cs:precise/gunicorn"68 charm: "cs:precise/gunicorn"
69 django13:69 django13:
70 branch: "lp:charmers/precise/python-django"70 branch: "lp:charms/precise/python-django"
71 charm: python-django71 charm: python-django
72 num_units: 172 num_units: 1
73 options:73 options:
@@ -85,7 +85,7 @@
85 gunicorn:85 gunicorn:
86 charm: "cs:precise/gunicorn"86 charm: "cs:precise/gunicorn"
87 django14:87 django14:
88 branch: "lp:charmers/precise/python-django"88 branch: "lp:charms/precise/python-django"
89 charm: python-django89 charm: python-django
90 num_units: 190 num_units: 1
91 options:91 options:

Subscribers

People subscribed via source and target branches

to all changes: