Had made a separate dir for the integration level tests thinking that

the unit tests were distributed with the package. After realizing this isn't so I dropped them into the `tests` dir.
pika · Feb 12, 2013 · ee86bef · ee86bef
1 parent 5ad8258
commit ee86bef
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/integration.cfg b/integration.cfg
@@ -1,3 +1,3 @@
 [nosetests]
-tests=testing/integration
+tests=tests/integration
 verbosity=3
diff --git a/testing/integration/README.md → tests/integration/README.md b/testing/integration/README.md → tests/integration/README.md
@@ -1,9 +1,9 @@
 ## Pika Integration Tests
 
-Install the necessary packages with `pip install -r testing/integration/requirements.txt`.
+Install the necessary packages with `pip install -r tests/integration/requirements.txt`.
-Next copy `testing/integration/broker.conf.in` to `testing/integration/broker.conf` and 
+Next copy `tests/integration/broker.conf.in` to `tests/integration/broker.conf` and 
 tweak settings to suit. The tests can be run with `make integration` or with
-`nosetests -w testing/integration`.
+`nosetests -w tests/integration`.
 
 ### Dependencies
 * nose

diff --git a/testing/integration/broker.conf → tests/integration/broker.conf b/testing/integration/broker.conf → tests/integration/broker.conf
diff --git a/testing/integration/connection_tests.py → tests/integration/connection_tests.py b/testing/integration/connection_tests.py → tests/integration/connection_tests.py
diff --git a/testing/integration/requirements.txt → tests/integration/requirements.txt b/testing/integration/requirements.txt → tests/integration/requirements.txt
diff --git a/testing/integration/test_base.py → tests/integration/test_base.py b/testing/integration/test_base.py → tests/integration/test_base.py