diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/gswauth_functional_tests.sh | 13 | ||||
-rwxr-xr-x | tools/keystone_functional_tests.sh | 6 | ||||
-rwxr-xr-x | tools/object_expirer_functional.sh (renamed from tools/swkrbath_functional_tests.sh) | 53 | ||||
-rw-r--r-- | tools/requirements.txt | 7 | ||||
-rwxr-xr-x | tools/tempauth_functional_tests.sh (renamed from tools/functional_tests.sh) | 9 | ||||
-rw-r--r-- | tools/test-requires | 12 |
6 files changed, 38 insertions, 62 deletions
diff --git a/tools/gswauth_functional_tests.sh b/tools/gswauth_functional_tests.sh index dbe2248..287a20a 100755 --- a/tools/gswauth_functional_tests.sh +++ b/tools/gswauth_functional_tests.sh @@ -50,7 +50,7 @@ quit() fail() { cleanup - quit "$1" + quit "$1" } run_generic_tests() @@ -66,9 +66,9 @@ run_generic_tests() nosetests -v --exe \ --with-xunit \ - --xunit-file functional_tests/gluster-swift-gswauth-generic-functional-TC-report.xml \ + --xunit-file functional_tests_result/gluster-swift-gswauth-generic-functional-TC-report.xml \ --with-html-output \ - --html-out-file functional_tests/gluster-swift-gswauth-generic-functional-result.html \ + --html-out-file functional_tests_result/gluster-swift-gswauth-generic-functional-result.html \ test/functional || fail "Functional tests failed" } @@ -91,6 +91,7 @@ export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf # Install the configuration files sudo mkdir /etc/swift > /dev/null 2>&1 +sudo cp -r test/functional_auth/common_conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" sudo cp -r test/functional_auth/gswauth/conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" sudo_env gluster-swift-gen-builders test test2 gsmetadata || fail "Unable to create ring files" @@ -101,12 +102,12 @@ sudo_env swift-init main start || fail "Unable to start swift" #swauth-prep sudo_env gswauth-prep -K gswauthkey || fail "Unable to prep gswauth" -mkdir functional_tests > /dev/null 2>&1 +mkdir functional_tests_result > /dev/null 2>&1 nosetests -v --exe \ --with-xunit \ - --xunit-file functional_tests/gluster-swift-gswauth-functional-TC-report.xml \ + --xunit-file functional_tests_result/gluster-swift-gswauth-functional-TC-report.xml \ --with-html-output \ - --html-out-file functional_tests/gluster-swift-gswauth-functional-result.html \ + --html-out-file functional_tests_result/gluster-swift-gswauth-functional-result.html \ test/functional_auth/gswauth || fail "Functional gswauth test failed" run_generic_tests diff --git a/tools/keystone_functional_tests.sh b/tools/keystone_functional_tests.sh index 620bcc7..b5aa25a 100755 --- a/tools/keystone_functional_tests.sh +++ b/tools/keystone_functional_tests.sh @@ -87,15 +87,15 @@ sudo_env gluster-swift-gen-builders $accounts || fail "Unable to create ring fil sudo service memcached start || fail "Unable to start memcached" sudo_env swift-init main start || fail "Unable to start swift" -mkdir functional_tests > /dev/null 2>&1 +mkdir functional_tests_result > /dev/null 2>&1 echo "== Keystone: Generic Functional Tests ==" nosetests -v --exe \ --with-xunit \ - --xunit-file functional_tests/gluster-swift-keystone-generic-functional-TC-report.xml \ + --xunit-file functional_tests_result/gluster-swift-keystone-generic-functional-TC-report.xml \ --with-html-output \ - --html-out-file functional_tests/gluster-swift-keystone-generic-functional-result.html \ + --html-out-file functional_tests_result/gluster-swift-keystone-generic-functional-result.html \ test/functional || fail "Functional tests failed" cleanup diff --git a/tools/swkrbath_functional_tests.sh b/tools/object_expirer_functional.sh index 9995f1d..2578619 100755 --- a/tools/swkrbath_functional_tests.sh +++ b/tools/object_expirer_functional.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2014 Red Hat, Inc. +# Copyright (c) 2013 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,69 +28,60 @@ cleanup() sudo service memcached stop sudo_env swift-init main stop sudo rm -rf /etc/swift > /dev/null 2>&1 - for acct in /mnt/gluster-object/* ; do - sudo rm -rf /mnt/gluster-object/${acct}/* > /dev/null 2>&1 - sudo setfattr -x user.swift.metadata /mnt/gluster-object/${acct} > /dev/null 2>&1 - done + sudo rm -rf /mnt/gluster-object/test{,2}/* > /dev/null 2>&1 + sudo rm -rf /mnt/gluster-object/gsexpiring/* > /dev/null 2>&1 + sudo setfattr -x user.swift.metadata /mnt/gluster-object/test{,2} > /dev/null 2>&1 } quit() { - echo "$1" - exit 1 + echo "$1" + exit 1 } fail() { - cleanup - quit "$1" + cleanup + quit "$1" } ### MAIN ### # Only run if there is no configuration in the system if [ -x /etc/swift ] ; then - quit "/etc/swift exists, cannot run functional tests." + quit "/etc/swift exists, cannot run functional tests." fi # Check the directories exist -DIRS="/mnt/gluster-object /mnt/gluster-object/test /mnt/gluster-object/test2 /mnt/gluster-object/gsmetadata" +DIRS="/mnt/gluster-object /mnt/gluster-object/test /mnt/gluster-object/test2 /mnt/gluster-object/gsexpiring" for d in $DIRS ; do - if [ ! -x $d ] ; then - quit "$d must exist on an XFS or GlusterFS volume" - fi + if [ ! -x $d ] ; then + quit "$d must exist on an XFS or GlusterFS volume" + fi done export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf # Install the configuration files sudo mkdir /etc/swift > /dev/null 2>&1 -sudo cp -r test/functional_auth/swiftkerbauth/conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" +sudo cp -r test/functional_auth/common_conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" +sudo cp -r test/functional_auth/tempauth/conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" +sudo_env gluster-swift-gen-builders gsexpiring test || fail "Unable to create ring files" -# Create the ring files -accounts="" -for acct in /mnt/gluster-object/* ; do - acct=`basename $acct` - accounts="$acct $accounts" -done -sudo_env gluster-swift-gen-builders $accounts || fail "Unable to create ring files" +# Remove old files +sudo rm -rf /mnt/gluster-object/test* > /dev/null 2>&1 +sudo rm -rf /mnt/gluster-object/gsexpiring/* > /dev/null 2>&1 # Start the services sudo service memcached start || fail "Unable to start memcached" sudo_env swift-init main start || fail "Unable to start swift" -mkdir functional_tests > /dev/null 2>&1 - -echo "== SwiftKerbAuth: Functional Tests ==" - +echo "Running functional tests with tempauth" +mkdir functional_tests > /dev/null 2>&1 nosetests -v --exe \ - --with-xunit \ - --xunit-file functional_tests/gluster-swift-swiftkerbauth-generic-functional-TC-report.xml \ - --with-html-output \ - --html-out-file functional_tests/gluster-swift-swiftkerbauth-generic-functional-result.html \ - test/functional_auth/swiftkerbauth || fail "Functional tests failed" + test/object_expirer_functional || fail "Object expirer functional tests failed" cleanup exit 0 diff --git a/tools/requirements.txt b/tools/requirements.txt deleted file mode 100644 index bbac51a..0000000 --- a/tools/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -dnspython>=1.9.4 -eventlet>=0.9.15 -greenlet>=0.3.1 -netifaces>=0.5 -pastedeploy>=1.3.3 -simplejson>=2.0.9 -xattr>=0.4 diff --git a/tools/functional_tests.sh b/tools/tempauth_functional_tests.sh index 94d5d9b..f237f3e 100755 --- a/tools/functional_tests.sh +++ b/tools/tempauth_functional_tests.sh @@ -64,6 +64,7 @@ export SWIFT_TEST_CONFIG_FILE=/etc/swift/test.conf # Install the configuration files sudo mkdir /etc/swift > /dev/null 2>&1 +sudo cp -r test/functional_auth/common_conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" sudo cp -r test/functional_auth/tempauth/conf/* /etc/swift || fail "Unable to copy configuration files to /etc/swift" sudo_env gluster-swift-gen-builders test test2 || fail "Unable to create ring files" @@ -71,13 +72,15 @@ sudo_env gluster-swift-gen-builders test test2 || fail "Unable to create ring fi sudo service memcached start || fail "Unable to start memcached" sudo_env swift-init main start || fail "Unable to start swift" +echo "Running functional tests with tempauth" + mkdir functional_tests > /dev/null 2>&1 nosetests -v --exe \ --with-xunit \ --xunit-file functional_tests/gluster-swift-generic-functional-TC-report.xml \ - --with-html-output \ - --html-out-file functional_tests/gluster-swift-generic-functional-result.html \ - test/functional || fail "Functional tests failed" + --with-html-output \ + --html-out-file functional_tests/gluster-swift-generic-functional-result.html \ + test/functional || fail "Functional tests failed" cleanup exit 0 diff --git a/tools/test-requires b/tools/test-requires deleted file mode 100644 index 63d499e..0000000 --- a/tools/test-requires +++ /dev/null @@ -1,12 +0,0 @@ -# Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.5.6,<0.6 -coverage -nose -nosexcover -openstack.nose_plugin -nosehtmloutput -sphinx>=1.1.2,<1.2 -mock>=0.8.0 -python-swiftclient -python-keystoneclient -prettytable |