From 0086a55bb7de1ef5dc7a24583f5fc2b560e835fd Mon Sep 17 00:00:00 2001 From: Jeff Darcy Date: Wed, 8 Apr 2015 17:17:13 -0400 Subject: tests: remove tests for clear-locks These are suspected of causing core dumps during regression tests, leading to spurious failures. Per email conversation, since this isn't a supported feature anyway, the tests are being removed to facilitate testing of features we do support. Change-Id: I7fd5c76d26dd6c3ffa91f89fc10469ae3a63afdf BUG: 1195415 Signed-off-by: Jeff Darcy Reviewed-on: http://review.gluster.org/10167 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Vijay Bellur --- tests/bugs/glusterd/bug-824753-file-locker.c | 42 -------------------------- tests/bugs/glusterd/bug-824753.t | 45 ---------------------------- 2 files changed, 87 deletions(-) delete mode 100644 tests/bugs/glusterd/bug-824753-file-locker.c delete mode 100755 tests/bugs/glusterd/bug-824753.t (limited to 'tests/bugs/glusterd') diff --git a/tests/bugs/glusterd/bug-824753-file-locker.c b/tests/bugs/glusterd/bug-824753-file-locker.c deleted file mode 100644 index ea8a7630e81..00000000000 --- a/tests/bugs/glusterd/bug-824753-file-locker.c +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include - -int main (int argc, char *argv[]) -{ - int fd = -1; - int ret = -1; - char command[2048] = ""; - char filepath[255] = ""; - struct flock fl; - - fl.l_type = F_WRLCK; - fl.l_whence = SEEK_SET; - fl.l_start = 7; - fl.l_len = 1; - fl.l_pid = getpid(); - - snprintf(filepath, 255, "%s/%s", argv[4], argv[5]); - - fd = open(filepath, O_RDWR); - - if (fd == -1) - return -1; - - if (fcntl(fd, F_SETLKW, &fl) == -1) { - return -1; - } - - snprintf(command, sizeof(command), - "gluster volume clear-locks %s /%s kind all posix 0,7-1 |" - " grep %s | awk -F'..: ' '{print $1}' | grep %s:%s/%s", - argv[1], argv[5], argv[2], argv[2], argv[3], argv[1]); - - ret = system (command); - close(fd); - - if (ret) - return -1; - else - return 0; -} diff --git a/tests/bugs/glusterd/bug-824753.t b/tests/bugs/glusterd/bug-824753.t deleted file mode 100755 index 2ce4a07c5bd..00000000000 --- a/tests/bugs/glusterd/bug-824753.t +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc - -cleanup; - -## Start and create a volume -TEST glusterd; -TEST pidof glusterd; -TEST $CLI volume info; - -TEST $CLI volume create $V0 replica 2 stripe 2 $H0:$B0/${V0}{1,2,3,4,5,6,7,8}; - -function volinfo_field() -{ - local vol=$1; - local field=$2; - - $CLI volume info $vol | grep "^$field: " | sed 's/.*: //'; -} - -## Verify volume is is created -EXPECT "$V0" volinfo_field $V0 'Volume Name'; -EXPECT 'Created' volinfo_field $V0 'Status'; - -## Start volume and verify -TEST $CLI volume start $V0; -EXPECT 'Started' volinfo_field $V0 'Status'; - -TEST glusterfs -s $H0 --volfile-id=$V0 $M0 -touch $M0/file1; - -TEST $CC -g $(dirname $0)/bug-824753-file-locker.c -o $(dirname $0)/file-locker - -TEST $(dirname $0)/file-locker $V0 $H0 $B0 $M0 file1 - -## Finish up -TEST rm -f $(dirname $0)/file-locker -TEST $CLI volume stop $V0; -EXPECT 'Stopped' volinfo_field $V0 'Status'; - -TEST $CLI volume delete $V0; -TEST ! $CLI volume info $V0; - -cleanup; -- cgit