tests: Check aux umount is unmounted for quota tests

Change-Id: If57d08f3446755ea41f66ca258efcc8ea5a89063
BUG: 1218593
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/10480
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/10575

11 files changed, 19 insertions, 19 deletions

diff --git a/tests/bugs/quota/afr-quota-xattr-mdata-heal.t b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
index b7a15a31f66..486b0382d5d 100644
--- a/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
+++ b/tests/bugs/quota/afr-quota-xattr-mdata-heal.t
@@ -135,4 +135,6 @@ EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep syste
 EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}0/d | grep trusted.SGI_ACL_FILE)
 EXPECT "$acl_access_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep system.posix_acl_access)
 EXPECT "$acl_file_val" echo $(getfattr -d -m. -e hex $B0/${V0}1/d | grep trusted.SGI_ACL_FILE)
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup
diff --git a/tests/bugs/quota/bug-1023974.t b/tests/bugs/quota/bug-1023974.t
index 017a6decf88..06b66bf35a3 100644
--- a/tests/bugs/quota/bug-1023974.t
+++ b/tests/bugs/quota/bug-1023974.t
@@ -5,6 +5,7 @@
 # limit set.
 
 . $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 
 cleanup;
 
@@ -32,4 +33,6 @@ TEST dd if=/dev/urandom of=$M0/1/3/file bs=1024k count=102;
 #The corresponding rename(3) should fail with EDQUOT ("Disk quota exceeded")
 TEST ! mv $M0/1/3/ $M0/1/2/3_mvd;
 
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup;
diff --git a/tests/bugs/quota/bug-1035576.t b/tests/bugs/quota/bug-1035576.t
index dd4f499d98e..e3d32d107d0 100644
--- a/tests/bugs/quota/bug-1035576.t
+++ b/tests/bugs/quota/bug-1035576.t
@@ -49,4 +49,6 @@ TEST cat $M0/a/f
 #Now that data self-heal is done quota size value should be same
 quota_size_val0=$(get_hex_xattr trusted.glusterfs.quota.size $B0/${V0}0/a)
 TEST [ $quota_size_val0 == $quota_size_val1 ]
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup
diff --git a/tests/bugs/quota/bug-1038598.t b/tests/bugs/quota/bug-1038598.t
index c51bc470ce1..d930a4f62e8 100644
--- a/tests/bugs/quota/bug-1038598.t
+++ b/tests/bugs/quota/bug-1038598.t
@@ -76,5 +76,7 @@ TEST $CLI volume set $V0 features.soft-timeout 0
 TEST ! dd if=/dev/zero of=$M0/test_dir/file1.txt bs=1024k count=15
 EXPECT 'Yes' sl_exceeded "/test_dir";
 EXPECT 'Yes' hl_exceeded "/test_dir";
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 
 cleanup;
diff --git a/tests/bugs/quota/bug-1040423.t b/tests/bugs/quota/bug-1040423.t
index 4e7b5642c94..c6dbdb1ff81 100755
--- a/tests/bugs/quota/bug-1040423.t
+++ b/tests/bugs/quota/bug-1040423.t
@@ -65,8 +65,6 @@ EXPECT "1.0GB" get_hardlimit $V0
 
 _init;
 check_fattrs;
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup
-
-
-
-
diff --git a/tests/bugs/quota/bug-1049323.t b/tests/bugs/quota/bug-1049323.t
index 818c5f0e65b..95ef91d4272 100755
--- a/tests/bugs/quota/bug-1049323.t
+++ b/tests/bugs/quota/bug-1049323.t
@@ -30,19 +30,6 @@ TEST $CLI volume quota $V0 enable
 sleep 3;
 }
 
-function get_aux()
-{
-##Check if a auxiliary mount is there
-df -h | grep "/var/run/gluster/$V0" -
-
-if [ $? -eq 0 ]
-then
-        echo "0"
-else
-        echo "1"
-fi
-}
-
 function create_data()
 {
 #set some limit on the volume
diff --git a/tests/bugs/quota/bug-1087198.t b/tests/bugs/quota/bug-1087198.t
index 5121f1b35a2..6eaae076fcc 100644
--- a/tests/bugs/quota/bug-1087198.t
+++ b/tests/bugs/quota/bug-1087198.t
@@ -78,4 +78,6 @@ TEST grep -e "\"Usage is above soft limit:.*used by /\"" -- $BRICK_LOG_DIR/*
 ## Step 7
 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
 
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup;
diff --git a/tests/bugs/quota/bug-1100050.t b/tests/bugs/quota/bug-1100050.t
index e12f64f88d8..65a1250f246 100644
--- a/tests/bugs/quota/bug-1100050.t
+++ b/tests/bugs/quota/bug-1100050.t
@@ -22,4 +22,6 @@ TEST gluster volume quota $V0 limit-usage /dir 10MB;
 
 TEST mkdir $M0/dir/subdir;
 
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup;
diff --git a/tests/bugs/quota/bug-1104692.t b/tests/bugs/quota/bug-1104692.t
index 6f6b174aa03..3acffa4720c 100755
--- a/tests/bugs/quota/bug-1104692.t
+++ b/tests/bugs/quota/bug-1104692.t
@@ -27,6 +27,7 @@ TEST $CLI volume quota $V0 limit-usage /limit_one/limit_five 1GB
 #Cleanup
 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 TEST $CLI volume delete $V0
 
 cleanup;
diff --git a/tests/bugs/quota/bug-1153964.t b/tests/bugs/quota/bug-1153964.t
index c923b71ca73..cf5b07c1329 100644
--- a/tests/bugs/quota/bug-1153964.t
+++ b/tests/bugs/quota/bug-1153964.t
@@ -78,6 +78,6 @@ TEST rm -rf $N0/test_dir/
 
 EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
 
+TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 cleanup;
-
-
diff --git a/tests/bugs/quota/inode-quota.t b/tests/bugs/quota/inode-quota.t
index 12a18945d8b..58376d5058f 100644
--- a/tests/bugs/quota/inode-quota.t
+++ b/tests/bugs/quota/inode-quota.t
@@ -127,6 +127,7 @@ EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "0" quota_object_list_field "/test_dir" 4
 TEST $CLI volume quota $V0 remove-objects /test_dir
 
 TEST $CLI volume stop $V0
+EXPECT "1" get_aux
 TEST $CLI volume delete $V0
 
 cleanup;