x/swiftonfile
Code Issues Proposed changes

changes references to swiftonfile in tests scripts

Browse Source 
Signed-off-by: Thiago da Silva <thiago@redhat.com>
This commit is contained in:
Thiago da Silva 2014-07-07 13:47:32 -04:00
parent de24352275
commit 27fe040c3b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.functests
View File

@ -59,7 +59,7 @@ Before proceeding forward, please make sure you already have:
name = swiftonfile name = swiftonfile
default = yes default = yes
4. Copied etc/object-server.conf-gluster to /etc/swift/object-server/5.conf 4. Copied etc/object-server.conf-swiftonfile to /etc/swift/object-server/5.conf
5. Generated ring files for swiftonfile policy. 5. Generated ring files for swiftonfile policy.
Example: for policy with index 2 Example: for policy with index 2
@ -91,9 +91,9 @@ mkdir functional_tests_result > /dev/null 2>&1
print "Runnning functional tests" print "Runnning functional tests"
nosetests -v --exe \ nosetests -v --exe \
--with-xunit \ --with-xunit \
--xunit-file functional_tests_result/gluster-swift-generic-functional-TC-report.xml \ --xunit-file functional_tests_result/swiftonfile-generic-functional-TC-report.xml \
--with-html-output \ --with-html-output \
--html-out-file functional_tests_result/gluster-swift-generic-functional-result.html \ --html-out-file functional_tests_result/swiftonfile-generic-functional-result.html \
test/functional || fail "Functional tests failed" test/functional || fail "Functional tests failed"
cleanup cleanup
exit 0 exit 0

6
.functests-ci
View File

@ -80,7 +80,7 @@ print "Invoking SAIO's remakerings script"
remakerings remakerings
print "Copying conf files into /etc/swift. This will replace swift.conf and test.conf" print "Copying conf files into /etc/swift. This will replace swift.conf and test.conf"
\cp etc/object-server.conf-gluster /etc/swift/object-server/5.conf \cp etc/object-server.conf-swiftonfile /etc/swift/object-server/5.conf
\cp test/functional/conf/swift.conf /etc/swift/swift.conf \cp test/functional/conf/swift.conf /etc/swift/swift.conf
\cp test/functional/conf/test.conf /etc/swift/test.conf \cp test/functional/conf/test.conf /etc/swift/test.conf
@ -103,9 +103,9 @@ mkdir functional_tests_result > /dev/null 2>&1
print "Runnning functional tests" print "Runnning functional tests"
nosetests -v --exe \ nosetests -v --exe \
--with-xunit \ --with-xunit \
--xunit-file functional_tests_result/gluster-swift-generic-functional-TC-report.xml \ --xunit-file functional_tests_result/swiftonfile-generic-functional-TC-report.xml \
--with-html-output \ --with-html-output \
--html-out-file functional_tests_result/gluster-swift-generic-functional-result.html \ --html-out-file functional_tests_result/swiftonfile-generic-functional-result.html \
test/functional || fail "Functional tests failed" test/functional || fail "Functional tests failed"
cleanup cleanup
exit 0 exit 0

2
.unittests
View File

@ -26,7 +26,7 @@ else
cover_branches="--cover-branches --cover-html --cover-html-dir=$TOP_DIR/cover" cover_branches="--cover-branches --cover-html --cover-html-dir=$TOP_DIR/cover"
fi fi
cd $TOP_DIR/test/unit cd $TOP_DIR/test/unit
nosetests -v --exe --with-coverage --cover-package gluster. --cover-erase $cover_branches $@ nosetests -v --exe --with-coverage --cover-package swiftonfile --cover-erase $cover_branches $@
rvalue=$? rvalue=$?
rm -f .coverage rm -f .coverage
cd - cd -