summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgholt <devnull@brim.net>2012-03-12 21:54:31 +0000
committergholt <devnull@brim.net>2012-03-13 15:47:41 +0000
commit1c349a387db29d0e102c7df2b9c5c23f1c72db07 (patch)
tree48eceaa6cf95632e0b50f3412cb59b30c2457715
parent9e713e107829d867cbc2bb37f8cc0d95aa7c4390 (diff)
downloadswift-1c349a387db29d0e102c7df2b9c5c23f1c72db07.tar.gz
Make tests work like they used to.
Change-Id: I081d853a90ad0efce5b7a20b52794ce3348a9617
-rwxr-xr-x.functests9
-rwxr-xr-x.probetests4
-rwxr-xr-x.unittests4
-rw-r--r--doc/source/development_saio.rst3
4 files changed, 13 insertions, 7 deletions
diff --git a/.functests b/.functests
index fb2b0eb2e..a7be2b398 100755
--- a/.functests
+++ b/.functests
@@ -1,4 +1,9 @@
#!/bin/bash
-nosetests test/functional $@
-nosetests test/functionalnosetests $@
+cd test/functional
+nosetests --exe $@
+cd -
+
+cd test/functionalnosetests
+nosetests --exe $@
+cd -
diff --git a/.probetests b/.probetests
index 1fdd91816..38d8520a1 100755
--- a/.probetests
+++ b/.probetests
@@ -1,3 +1,5 @@
#!/bin/bash
-nosetests test/probe
+cd test/probe
+nosetests --exe
+cd -
diff --git a/.unittests b/.unittests
index aa54b06ff..6f99aecdb 100755
--- a/.unittests
+++ b/.unittests
@@ -1,4 +1,6 @@
#!/bin/bash
-nosetests test/unit --with-coverage --cover-package swift --cover-erase $@
+cd test/unit
+nosetests --exe --with-coverage --cover-package swift --cover-erase $@
rm -f .coverage
+cd -
diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst
index 01ab72bb9..165b60350 100644
--- a/doc/source/development_saio.rst
+++ b/doc/source/development_saio.rst
@@ -32,8 +32,6 @@ Installing dependencies and the core code
python-coverage python-dev python-nose python-setuptools python-simplejson
python-xattr sqlite3 xfsprogs python-webob python-eventlet
python-greenlet python-pastedeploy python-netifaces`
- #. `easy_install pip`
- #. `pip install openstack.nose_plugin`
#. Install anything else you want, like screen, ssh, vim, etc.
* On Fedora, log in as root and do:
@@ -43,7 +41,6 @@ Installing dependencies and the core code
#. `yum install xinetd rsync`
#. `yum install memcached`
#. `yum install python-netifaces python-nose`
- #. `pip install openstack.nose_plugin`
This installs all necessary dependencies, and also creates user `swift`
and group `swift`. So, `swift:swift` ought to be used in every place where