summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2012-10-21 07:15:30 -0400
committerMichael DeHaan <michael.dehaan@gmail.com>2012-10-21 07:15:30 -0400
commit572c66b7f6fa5697daac1cdbe118c9820cb75b10 (patch)
treee69a4cbbf06f9c53f482733ed4f8b44d90d85ad3
parent3c6d9972fe343c2515cf216dc56ea717447fe4ba (diff)
downloadansible-572c66b7f6fa5697daac1cdbe118c9820cb75b10.tar.gz
Add a bit more info about tests to CONTRIBUTING
-rw-r--r--CONTRIBUTING.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8ebbf6b43c..5c0e399442 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,13 +52,13 @@ We're not too strict on style considerations, but we require:
Testing Requirements
====================
-Tests are run by "make tests". To run the tests you need the following:-
+Automation tests are run by "make tests" and contain a mixture of integration and "unit" level tests. To run the tests you need the following:
* nose must be installed - https://nose.readthedocs.org/en/latest/
- * ansible tests require paramiko, PyYAML and json modules
- * The (optional) facter test requires facter to be installed.
- * Your user environment should allow "ssh myip" (where myip is your ip address)
- without a password - so a key held in ssh-agent and an authorised_keys entry.
+ * ansible tests require paramiko, PyYAML python modules, and python 2.6+.
+ * Some tests require additional components (facter, ohai) and will be skipped if not available.
+ * Your user environment should allow "ssh 127.0.0.1"
+ without a password - so a key held in ssh-agent and an authorized_keys entry.
Contributors License Agreement
==============================