summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/ci/logging.ini16
-rw-r--r--functest/opnfv_tests/openstack/cinder/read_data.sh2
-rw-r--r--functest/opnfv_tests/openstack/cinder/write_data.sh2
3 files changed, 10 insertions, 10 deletions
diff --git a/functest/ci/logging.ini b/functest/ci/logging.ini
index 98d2e7317..f14014354 100644
--- a/functest/ci/logging.ini
+++ b/functest/ci/logging.ini
@@ -2,14 +2,14 @@
keys=root,functest,api,ci,core,cli,opnfv_tests,utils,xtesting,xci,xcore,energy,xutils,sfc,sdnvpn,baro,warnings
[handlers]
-keys=console,wconsole,file,null
+keys=console,wconsole,file,dfile
[formatters]
keys=standard
[logger_root]
level=NOTSET
-handlers=null
+handlers=dfile
[logger_functest]
level=NOTSET
@@ -91,12 +91,6 @@ level=NOTSET
handlers=file,console
qualname=py.warnings
-[handler_null]
-class=NullHandler
-level=NOTSET
-formatter=standard
-args=()
-
[handler_console]
class=StreamHandler
level=INFO
@@ -115,6 +109,12 @@ level=DEBUG
formatter=standard
args=("/home/opnfv/functest/results/functest.log",)
+[handler_dfile]
+class=FileHandler
+level=DEBUG
+formatter=standard
+args=("/home/opnfv/functest/results/functest.debug.log",)
+
[formatter_standard]
format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
datefmt=
diff --git a/functest/opnfv_tests/openstack/cinder/read_data.sh b/functest/opnfv_tests/openstack/cinder/read_data.sh
index e6ad57bd3..2c5fdd4c0 100644
--- a/functest/opnfv_tests/openstack/cinder/read_data.sh
+++ b/functest/opnfv_tests/openstack/cinder/read_data.sh
@@ -13,7 +13,7 @@ VOL_DEV_NAME=${1:-vdb}
echo "VOL_DEV_NAME: $VOL_DEV_NAME"
echo "$(lsblk -l -o NAME)"
-if [ ! -z $VOL_DEV_NAME ]; then
+if [ ! -z $(lsblk -l -o NAME | grep $VOL_DEV_NAME) ]; then
sudo mount /dev/$VOL_DEV_NAME $DEST
if [ -f $DEST/new_data ]; then
echo "Found new data!"
diff --git a/functest/opnfv_tests/openstack/cinder/write_data.sh b/functest/opnfv_tests/openstack/cinder/write_data.sh
index 16cea17bf..6689309b9 100644
--- a/functest/opnfv_tests/openstack/cinder/write_data.sh
+++ b/functest/opnfv_tests/openstack/cinder/write_data.sh
@@ -14,7 +14,7 @@ echo "VOL_DEV_NAME: $VOL_DEV_NAME"
echo "$(lsblk -l -o NAME)"
-if [ ! -z $VOL_DEV_NAME ]; then
+if [ ! -z $(lsblk -l -o NAME | grep $VOL_DEV_NAME) ]; then
sudo /usr/sbin/mkfs.ext4 -F /dev/$VOL_DEV_NAME
sudo mount /dev/$VOL_DEV_NAME $DEST
sudo touch $DEST/new_data