summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2016-05-24 13:39:04 +0200
committerNiels de Vos <ndevos@redhat.com>2016-05-27 07:44:54 -0700
commitadfaae8dcfe00187f859b8a69268c575b2d789a1 (patch)
tree17245f68a5fa1f33ee74ee8db5db865b59033f4a /tests/basic
parent57d686204c3f71bb6b3aa2383949e4c9b9738059 (diff)
build: remove jbr and fdl, they is not ready for 3.8
Change-Id: Ia24ad18c43d56a751988e562323ede26d7785848 BUG: 1317278 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/14519 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/ec/ec.t6
-rw-r--r--tests/basic/jbr/jbr-volgen.t37
-rwxr-xr-xtests/basic/jbr/jbr.t33
3 files changed, 0 insertions, 76 deletions
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index a6ae287b7a7..6722c433a15 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -11,12 +11,6 @@ function my_getfattr {
getfattr --only-values -e text $* 2> /dev/null
}
-function get_rep_count {
- v=$(my_getfattr -n trusted.jbr.rep-count $1)
- #echo $v > /dev/tty
- echo $v
-}
-
function create_file {
dd if=/dev/urandom of=$1 bs=4k count=$2 conv=sync 2> /dev/null
}
diff --git a/tests/basic/jbr/jbr-volgen.t b/tests/basic/jbr/jbr-volgen.t
deleted file mode 100644
index fcd20e5f998..00000000000
--- a/tests/basic/jbr/jbr-volgen.t
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-
-volfiles=${GLUSTERD_WORKDIR}/vols/${V0}/
-check_brick_volfiles () {
- for vf in ${volfiles}${V0}.$(hostname).*.vol; do
- grep -qs experimental/jbr $vf || return
- # At least for now, nothing else would put a client translator
- # in a brick volfile.
- grep -qs protocol/client $vf || return
- done
- echo "OK"
-}
-
-TEST glusterd
-TEST pidof glusterd
-
-TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2}
-TEST $CLI volume set $V0 cluster.jbr on
-
-# Check that the client volfile got modified properly.
-TEST grep -qs experimental/jbrc ${volfiles}${V0}.tcp-fuse.vol
-
-# Check that the brick volfiles got modified as well.
-EXPECT "OK" check_brick_volfiles
-
-# Put things back and make sure the "undo" worked.
-TEST $CLI volume set $V0 cluster.jbr off
-TEST $CLI volume start $V0
-TEST $GFS -s $H0 --volfile-id $V0 $M0
-echo hello > $M0/probe
-EXPECT hello cat ${B0}/${V0}1/probe
-EXPECT hello cat ${B0}/${V0}2/probe
-
-cleanup
diff --git a/tests/basic/jbr/jbr.t b/tests/basic/jbr/jbr.t
deleted file mode 100755
index 283446c9635..00000000000
--- a/tests/basic/jbr/jbr.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../../include.rc
-. $(dirname $0)/../../volume.rc
-. $(dirname $0)/../../cluster.rc
-. $(dirname $0)/../../snapshot.rc
-
-cleanup;
-
-TEST verify_lvm_version;
-#Create cluster with 3 nodes
-TEST launch_cluster 3;
-TEST setup_lvm 3
-
-TEST $CLI_1 peer probe $H2;
-TEST $CLI_1 peer probe $H3;
-EXPECT_WITHIN $PROBE_TIMEOUT 2 peer_count;
-
-TEST $CLI_1 volume create $V0 replica 3 $H1:$L1 $H2:$L2 $H3:$L3
-TEST $CLI_1 volume set $V0 cluster.jbr on
-#TEST $CLI_1 volume set $V0 diagnostics.brick-log-level DEBUG
-TEST $CLI_1 volume start $V0
-
-TEST glusterfs --volfile-id=$V0 --volfile-server=$H1 --entry-timeout=0 $M0;
-
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" jbrc_child_up_status $V0 0
-
-echo "file" > $M0/file1
-TEST stat $L1/file1
-TEST stat $L2/file1
-TEST stat $L3/file1
-
-cleanup;