Merge lp:~nataliabidart/magicicada-server/test-passing-missing-mock into lp:magicicada-server

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 4
Proposed branch: lp:~nataliabidart/magicicada-server/test-passing-missing-mock
Merge into: lp:magicicada-server
Diff against target: 35 lines (+9/-2)
2 files modified
README.txt (+7/-1)
build/config-manager.txt (+2/-1)
To merge this branch: bzr merge lp:~nataliabidart/magicicada-server/test-passing-missing-mock
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Review via email: mp+268161@code.launchpad.net

Commit message

- Ensure test dependencies are listed in README.

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.txt'
2--- README.txt 2015-08-13 21:25:25 +0000
3+++ README.txt 2015-08-15 15:02:40 +0000
4@@ -65,7 +65,13 @@
5 python-yaml python-psycopg2 postgresql-contrib supervisor \
6 postgresql-plpython-9.1 python-django python-boto squid \
7 python-protobuf python-psutil python-testresources \
8- python-tz python-bson python-iso8601
9+ python-tz python-bson python-iso8601 python-openid
10+
11+For running the tests, install these extar deps:
12+
13+ sudo apt-get install python-gobject dbus python-dbus python-pyinotify \
14+ python-twisted-names python-oauth python-htplib2 python-mocker \
15+ python-testtools
16
17 Branch the project and get into that dir:
18
19
20=== modified file 'build/config-manager.txt'
21--- build/config-manager.txt 2015-08-05 13:10:02 +0000
22+++ build/config-manager.txt 2015-08-15 15:02:40 +0000
23@@ -22,7 +22,8 @@
24
25 ./.sourcecode/configglue ~configglue/configglue/trunk;revno=1
26 ./.sourcecode/dirspec ~ubuntuone-control-tower/dirspec/trunk;revno=14
27-./.sourcecode/django-openid-auth ~ubuntuone-pqm-team/django-openid-auth/stable;revno=103
28+./.sourcecode/django-openid-auth ~ubuntuone-pqm-team/django-openid-auth/stable;revno=107
29+./.sourcecode/mock ~ubuntuone-pqm-team/python-mock/stable
30 ./.sourcecode/oauthlib ~ubuntuone-pqm-team/oauthlib/stable;revno=209
31 ./.sourcecode/oops ~canonical-launchpad-branches/python-oops/trunk;revno=37
32 ./.sourcecode/oops-datedir-repo ~canonical-launchpad-branches/python-oops-datedir-repo/trunk;revno=48
33
34=== added symlink 'lib/mock.py'
35=== target is u'../.sourcecode/mock/mock.py'

Subscribers

People subscribed via source and target branches

to all changes: