From 27fe040c3b39b4852336442e6bac6e3f38d33060 Mon Sep 17 00:00:00 2001
From: Thiago da Silva <thiago@redhat.com>
Date: Mon, 7 Jul 2014 13:47:32 -0400
Subject: [PATCH] changes references to swiftonfile in tests scripts

Signed-off-by: Thiago da Silva <thiago@redhat.com>
---
 .functests    | 6 +++---
 .functests-ci | 6 +++---
 .unittests    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.functests b/.functests
index 1e1b9f5..0a7c6a8 100755
--- a/.functests
+++ b/.functests
@@ -59,7 +59,7 @@ Before proceeding forward, please make sure you already have:
        name = swiftonfile
        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.
    Example: for policy with index 2
@@ -91,9 +91,9 @@ mkdir functional_tests_result > /dev/null 2>&1
 print "Runnning functional tests"
 nosetests -v --exe \
 	--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 \
-    --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"
 cleanup
 exit 0
diff --git a/.functests-ci b/.functests-ci
index 93a0d83..e721f64 100755
--- a/.functests-ci
+++ b/.functests-ci
@@ -80,7 +80,7 @@ print "Invoking SAIO's remakerings script"
 remakerings
 
 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/test.conf /etc/swift/test.conf
 
@@ -103,9 +103,9 @@ mkdir functional_tests_result > /dev/null 2>&1
 print "Runnning functional tests"
 nosetests -v --exe \
 	--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 \
-    --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"
 cleanup
 exit 0
diff --git a/.unittests b/.unittests
index fcd066a..0e2a382 100755
--- a/.unittests
+++ b/.unittests
@@ -26,7 +26,7 @@ else
     cover_branches="--cover-branches --cover-html --cover-html-dir=$TOP_DIR/cover"
 fi
 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=$?
 rm -f .coverage
 cd -