summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@rackspace.com>2011-06-14 15:07:48 -0500
committerDolph Mathews <dolph.mathews@rackspace.com>2011-06-14 15:07:48 -0500
commit72e4edcc12f4741bd945adf777fe43f3ffcd62d6 (patch)
treecee7d837444a23213d9a0b48234aaaae39e1cabd
parentd3489fc71dcaec1d9290a183de6e422be2b0c3f1 (diff)
Added pip requirements file for testing environments.
-rw-r--r--README.md15
-rw-r--r--tools/pip-requires-testing2
2 files changed, 11 insertions, 6 deletions
diff --git a/README.md b/README.md
index dddf7cb1..42e35980 100644
--- a/README.md
+++ b/README.md
@@ -78,16 +78,17 @@ By default, configuration parameters are parsed from `etc/keystone.conf`.
## Dependencies
+You may need to prefix your `pip install` commands with `sudo`, depending on your environment.
+
<pre>
-# Show Dependencies
+# Show dependencies
$ cat tools/pip-requires
-# Install Dependencies
-$ sudo pip install -r tools/pip-requires
-
-# Keystone uses the DTest test framework for testing. Install that separately using:
-$ sudo pip install DTest
+# Install dependencies
+$ pip install -r tools/pip-requires
+# Install unit/functional test dependencies
+$ pip install -r tools/pip-requires-testing
</pre>
## Running Keystone
@@ -111,6 +112,8 @@ By default, configuration parameters (such as the IP and port binding for each s
## Running Tests
+Before running tests, ensure you have installed the testing dependencies as described in the Dependencies section above.
+
#### Test data
A set of sample data can be added by running a shell script:
diff --git a/tools/pip-requires-testing b/tools/pip-requires-testing
new file mode 100644
index 00000000..49919045
--- /dev/null
+++ b/tools/pip-requires-testing
@@ -0,0 +1,2 @@
+webtest
+DTest \ No newline at end of file