Merge "Move the tests from functionalnosetests"

2014-01-10 01:38:43 +00:00 · 2014-01-10 01:38:43 +00:00 · bc0d233c9d
commit bc0d233c9d
parent a877785cf2 65a03e55cd
6 changed files with 2 additions and 7 deletions
--- a/.functests
+++ b/.functests
@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")

 cd ${SRC_DIR}/test/functional
 nosetests --exe $@
-func1=$?
+rvalue=$?
 cd -

-cd ${SRC_DIR}/test/functionalnosetests
-nosetests --exe $@
-func2=$?
-cd -
-
-exit $((func1 + func2))
+exit $rvalue
--- a/test/functionalnosetests/swift_testing.py
+++ b/test/functionalnosetests/swift_testing.py
--- a/test/functionalnosetests/test_account.py
+++ b/test/functionalnosetests/test_account.py
--- a/test/functionalnosetests/test_container.py
+++ b/test/functionalnosetests/test_container.py
--- a/test/functionalnosetests/test_object.py
+++ b/test/functionalnosetests/test_object.py
--- a/test/functionalnosetests/init.py
+++ b/test/functionalnosetests/init.py