summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2013-12-16 16:28:18 +0530
committerVijay Bellur <vbellur@redhat.com>2014-04-28 09:40:16 -0700
commit125e33d9de15908fce8849d875581e738e30cbad (patch)
treed104b84038729d5b5f603c132cb548be61229c66
parent75cb75fe8207eb4407253b42bb2d0d8f2c7341ee (diff)
Tests: Changes to tests for glfs-heal implementation.
volume heal <volname> info does not depend on self-heald anymore so removed one complete test tests/bugs/bug-880898.t and also removed specific tests related to that in tests/basic/self-heald.t. Change-Id: I2e5cd3641b86cad63af41c9564d57ab6ebb60742 BUG: 1039544 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/6515 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Ravishankar N <ravishankar@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--tests/basic/self-heald.t2
-rw-r--r--tests/bugs/bug-880898.t23
2 files changed, 1 insertions, 24 deletions
diff --git a/tests/basic/self-heald.t b/tests/basic/self-heald.t
index 4468c881bac..bed008704c2 100644
--- a/tests/basic/self-heald.t
+++ b/tests/basic/self-heald.t
@@ -30,8 +30,8 @@ cd ~
EXPECT "$HEAL_FILES" afr_get_pending_heal_count $V0
TEST ! $CLI volume heal $V0
TEST $CLI volume set $V0 cluster.self-heal-daemon off
-TEST ! $CLI volume heal $V0 info
TEST ! $CLI volume heal $V0
+TEST ! $CLI volume heal $V0 full
TEST $CLI volume start $V0 force
TEST $CLI volume set $V0 cluster.self-heal-daemon on
EXPECT_WITHIN 20 "Y" glustershd_up_status
diff --git a/tests/bugs/bug-880898.t b/tests/bugs/bug-880898.t
deleted file mode 100644
index a069d4a8ac1..00000000000
--- a/tests/bugs/bug-880898.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-TEST glusterd
-TEST $CLI volume create $V0 replica 2 $H0:$B0/brick1 $H0:$B0/brick2
-TEST $CLI volume start $V0
-pkill glusterfs
-uuid=""
-for line in $(cat /var/lib/glusterd/glusterd.info)
-do
- if [[ $line == UUID* ]]
- then
- uuid=`echo $line | sed -r 's/^.{5}//'`
- fi
-done
-
-gluster volume heal $V0 info | grep "Status: self-heal-daemon is not running on $uuid";
-EXPECT "0" echo $?
-
-cleanup;