From: Thomas Thrainer <thomasth@google.com>
Date: Mon, 29 Apr 2013 11:51:27 +0000 (+0200)
Subject: Add dependency on python-mock
X-Git-Tag: v2.9.0beta1~402
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/7a694e30b981200fe487e3afa2ecd4c49d602b8e

Add dependency on python-mock

Python Mock (http://www.voidspace.org.uk/python/mock/) is a mocking
library for Python. It is included in the standard Python distribution
as of Python 3.3, but has been around for quite a while. Debian unstable
contains a version we require.

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---

diff --git a/configure.ac b/configure.ac
index b2ae618..80f6156 100644
--- a/configure.ac
+++ b/configure.ac
@@ -758,6 +758,7 @@ AC_PYTHON_MODULE(pycurl, t)
 AC_PYTHON_MODULE(bitarray, t)
 AC_PYTHON_MODULE(ipaddr, t)
 AC_PYTHON_MODULE(yaml, t)
+AC_PYTHON_MODULE(mock)
 AC_PYTHON_MODULE(affinity)
 AC_PYTHON_MODULE(paramiko)
 
diff --git a/devel/build_chroot b/devel/build_chroot
index 43ca4d3..d14f59e 100755
--- a/devel/build_chroot
+++ b/devel/build_chroot
@@ -90,7 +90,8 @@ in_chroot -- \
   $APT_INSTALL lvm2 ssh bridge-utils iproute iputils-arping \
                ndisc6 python python-pyopenssl openssl \
                python-pyparsing python-simplejson \
-               python-pyinotify python-pycurl python-yaml socat fping
+               python-pyinotify python-pycurl python-yaml python-mock \
+               socat fping
 
 in_chroot -- \
   $APT_INSTALL python-paramiko qemu-utils
diff --git a/doc/devnotes.rst b/doc/devnotes.rst
index d6cfc2c..82bad09 100644
--- a/doc/devnotes.rst
+++ b/doc/devnotes.rst
@@ -16,6 +16,7 @@ Most dependencies from :doc:`install-quick`, including ``qemu-img``
 - `python-epydoc <http://epydoc.sourceforge.net/>`_
 - `python-sphinx <http://sphinx.pocoo.org/>`_
   (tested with version 1.1.3)
+- `python-mock <http://www.voidspace.org.uk/python/mock/>`_
 - `graphviz <http://www.graphviz.org/>`_
 - the `en_US.UTF-8` locale must be enabled on the system
 - `pylint <http://www.logilab.org/857>`_ and its associated
@@ -47,7 +48,7 @@ Installation of all dependencies listed here::
 
      $ apt-get install python-setuptools automake git fakeroot
      $ apt-get install pandoc python-epydoc graphviz
-     $ apt-get install python-yaml
+     $ apt-get install python-yaml python-mock
      $ cd / && sudo easy_install \
                sphinx \
                logilab-astng==0.23.1 \