summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-04-08 17:17:13 -0400
committerRaghavendra Bhat <raghavendra@redhat.com>2015-05-19 06:33:22 -0700
commit06d42b30d8eefb6fb5f29d81ec36573a088abe17 (patch)
tree14b52e03ce43b2fffad4fb972b54e4e144f70c63
parentf7b8b1c95a11a8100b3bbb2a820dcead1b094655 (diff)
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: 1219967 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on-master: http://review.gluster.org/10167 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> Signed-off-by: Shyam <srangana@redhat.com> Reviewed-on: http://review.gluster.org/10696 Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
-rw-r--r--tests/bugs/bug-1179050.t23
-rw-r--r--tests/bugs/bug-824753-file-locker.c42
-rwxr-xr-xtests/bugs/bug-824753.t45
3 files changed, 0 insertions, 110 deletions
diff --git a/tests/bugs/bug-1179050.t b/tests/bugs/bug-1179050.t
deleted file mode 100644
index be261cbc144..00000000000
--- a/tests/bugs/bug-1179050.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume create $V0 redundancy 1 $H0:$B0/${V0}{0..2}
-EXPECT "Created" volinfo_field $V0 'Status'
-TEST $CLI volume start $V0
-EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Started" volinfo_field $V0 'Status'
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-id=/$V0 --volfile-server=$H0 $M0
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" ec_child_up_count $V0 0
-
-TEST $CLI volume clear-locks $V0 / kind all inode
-
-sleep 1
-
-EXPECT "3" ec_child_up_count $V0 0
-
-cleanup
diff --git a/tests/bugs/bug-824753-file-locker.c b/tests/bugs/bug-824753-file-locker.c
deleted file mode 100644
index 903e23e0a1f..00000000000
--- a/tests/bugs/bug-824753-file-locker.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <fcntl.h>
-
-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/bug-824753.t b/tests/bugs/bug-824753.t
deleted file mode 100755
index 38f6bf6965f..00000000000
--- a/tests/bugs/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 gcc -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;