openstack/swift
Code Issues Proposed changes

Merge "Move the tests from functionalnosetests"

Browse Source
This commit is contained in:
Jenkins 2014-01-10 01:38:43 +00:00 committed by Gerrit Code Review
commit bc0d233c9d
6 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.functests
View File

@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
cd ${SRC_DIR}/test/functional cd ${SRC_DIR}/test/functional
nosetests --exe $@ nosetests --exe $@
func1=$? rvalue=$?
cd - cd -
cd ${SRC_DIR}/test/functionalnosetests exit $rvalue
nosetests --exe $@
func2=$?
cd -
exit $((func1 + func2))

0
test/functionalnosetests/swift_testing.py → test/functional/swift_testing.py
View File

0
test/functionalnosetests/test_account.py → test/functional/test_account.py
View File

0
test/functionalnosetests/test_container.py → test/functional/test_container.py
View File

0
test/functionalnosetests/test_object.py → test/functional/test_object.py
View File

0
test/functionalnosetests/__init__.py
View File