summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-05 16:58:14 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-05 16:58:14 -0300
commitc1203f645af746f1eb2ea9d8140035586b123ff4 (patch)
treebd848a52ceb1619b200a44f04a0b7ad87c3fec88 /pkg
parentb968f83b712c44945f123a077bba18955b738d35 (diff)
parentd89d0c79e279ce2103021deabd226f67986e52c1 (diff)
Merge remote-tracking branch 'kali/bug/re-add-mock-as-testing-dep' into develop
Diffstat (limited to 'pkg')
-rw-r--r--pkg/requirements-testing.pip2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip
index 2df5fe56..e789664a 100644
--- a/pkg/requirements-testing.pip
+++ b/pkg/requirements-testing.pip
@@ -1,6 +1,7 @@
nose
nose-exclude
nose-progressive
+mock
unittest2 # TODO we should include this dep only for python2.6
@@ -13,6 +14,5 @@ tox
# double reqs
# (the client already includes, which gives some errors)
# -----------
-# mock # re-add XXX
#twisted
#zope.interface