Code Review
/
openstack-build
/
cinder-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Tests for Cinder packages"
[openstack-build/cinder-build.git]
/
tests
/
runtests.sh
diff --git
a/tests/runtests.sh
b/tests/runtests.sh
index d26c49f187c2c65abebaa7c59b748fbb05ce20c8..6691d047d14170ad49264022c2024a49d6803b97 100755
(executable)
--- a/
tests/runtests.sh
+++ b/
tests/runtests.sh
@@
-6,21
+6,17
@@
RES=0
function test_cinder_service(){
echo "Starting Cinder $1..."
function test_cinder_service(){
echo "Starting Cinder $1..."
-
/etc/init.d/
$1 start
+
service
$1 start
sleep 5
sleep 5
- if [ "$1" == "api" ]; then
- service_running=`netstat -nat | grep $2 | wc -l`
- else
- service_running=`ps -Af | grep cinder-$2 | wc -l`
- fi
-
- if [ service_running ]; then
- echo "Cinder API successfully started"
- /etc/init.d/$1 stop
- else
+ service_result=0
+ service_running=`netstat -nat | grep $2 | wc -l`
+ if [ $service_running -eq 0 ]; then
echo "Can not start Cinder $1 service"
RES=1
echo "Can not start Cinder $1 service"
RES=1
+ else
+ echo "Cinder $1 successfully started"
+ service $1 stop
fi
}
fi
}
@@
-62,8
+58,8
@@
case $1 in
fi
test_cinder_service openstack-cinder-api 8776
fi
test_cinder_service openstack-cinder-api 8776
- test_cinder_service openstack-cinder-volume
- test_cinder_service openstack-cinder-scheduler
+ check_file_exists "/usr/bin/cinder-volume"
+ check_file_exists "/usr/bin/cinder-scheduler"
;;
cinder-common)
test_cinder_configs
;;
cinder-common)
test_cinder_configs
@@
-71,15
+67,13
@@
case $1 in
;;
cinder-scheduler)
check_file_exists "/usr/bin/cinder-scheduler"
;;
cinder-scheduler)
check_file_exists "/usr/bin/cinder-scheduler"
- test_cinder_service cinder-scheduler
;;
cinder-api)
check_file_exists "/usr/bin/cinder-api"
test_cinder_service cinder-api 8776
;;
cinder-volume)
;;
cinder-api)
check_file_exists "/usr/bin/cinder-api"
test_cinder_service cinder-api 8776
;;
cinder-volume)
- check_file_exists "/usr/bin/cinder-api"
- test_cinder_service cinder-volume
+ check_file_exists "/usr/bin/cinder-volume"
;;
openstack-cinder-doc)
echo "No test for docs defined"
;;
openstack-cinder-doc)
echo "No test for docs defined"