74b1de
From 79c74009892804419dce264399f3fde357d5b1c3 Mon Sep 17 00:00:00 2001
74b1de
From: Susant Palai <spalai@redhat.com>
74b1de
Date: Tue, 2 Apr 2019 11:07:03 +0530
74b1de
Subject: [PATCH 40/52] build: Remove unsupported test cases failing
74b1de
 consistently
74b1de
74b1de
The following two test cases failing in downstream regression runs.
74b1de
Hence removing them as they are not supported downstream.
74b1de
74b1de
tests/basic/cloudsync-sanity.t
74b1de
tests/bugs/distribute/bug-882278.t
74b1de
74b1de
Label: DOWNSTREAM ONLY
74b1de
74b1de
Change-Id: Ie4b506639a017ec9910e44df1b721d9bfadf07b3
74b1de
Signed-off-by: Susant Palai <spalai@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/166662
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
Tested-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 tests/basic/cloudsync-sanity.t     | 22 ------------
74b1de
 tests/bugs/distribute/bug-882278.t | 73 --------------------------------------
74b1de
 2 files changed, 95 deletions(-)
74b1de
 delete mode 100644 tests/basic/cloudsync-sanity.t
74b1de
 delete mode 100755 tests/bugs/distribute/bug-882278.t
74b1de
74b1de
diff --git a/tests/basic/cloudsync-sanity.t b/tests/basic/cloudsync-sanity.t
74b1de
deleted file mode 100644
74b1de
index 3cf719d..0000000
74b1de
--- a/tests/basic/cloudsync-sanity.t
74b1de
+++ /dev/null
74b1de
@@ -1,22 +0,0 @@
74b1de
-#!/bin/bash
74b1de
-
74b1de
-. $(dirname $0)/../include.rc
74b1de
-. $(dirname $0)/../volume.rc
74b1de
-
74b1de
-cleanup;
74b1de
-
74b1de
-TEST glusterd
74b1de
-TEST pidof glusterd
74b1de
-
74b1de
-TEST $CLI volume create $V0 replica 3  $H0:$B0/${V0}{1,2,3,4,5,6,7,8,9};
74b1de
-TEST $CLI volume set $V0 features.cloudsync enable;
74b1de
-TEST $CLI volume start $V0;
74b1de
-
74b1de
-## Mount FUSE
74b1de
-TEST $GFS -s $H0 --volfile-id $V0 $M1;
74b1de
-
74b1de
-# This test covers lookup, mkdir, mknod, symlink, link, rename,
74b1de
-# create operations
74b1de
-TEST $(dirname $0)/rpc-coverage.sh $M1
74b1de
-
74b1de
-cleanup;
74b1de
diff --git a/tests/bugs/distribute/bug-882278.t b/tests/bugs/distribute/bug-882278.t
74b1de
deleted file mode 100755
74b1de
index 8cb5147..0000000
74b1de
--- a/tests/bugs/distribute/bug-882278.t
74b1de
+++ /dev/null
74b1de
@@ -1,73 +0,0 @@
74b1de
-#!/bin/bash
74b1de
-
74b1de
-. $(dirname $0)/../../include.rc
74b1de
-. $(dirname $0)/../../volume.rc
74b1de
-cleanup
74b1de
-
74b1de
-# Is there a good reason to require --fqdn elsewhere?  It's worse than useless
74b1de
-# here.
74b1de
-H0=$(hostname -s)
74b1de
-
74b1de
-function recreate {
74b1de
-	# The rm is necessary so we don't get fooled by leftovers from old runs.
74b1de
-	rm -rf $1 && mkdir -p $1
74b1de
-}
74b1de
-
74b1de
-function count_lines {
74b1de
-	grep "$1" $2/* | wc -l
74b1de
-}
74b1de
-
74b1de
-TEST glusterd
74b1de
-TEST pidof glusterd
74b1de
-TEST $CLI volume info;
74b1de
-
74b1de
-## Start and create a volume
74b1de
-TEST recreate ${B0}/${V0}-0
74b1de
-TEST recreate ${B0}/${V0}-1
74b1de
-TEST $CLI volume create $V0 $H0:$B0/${V0}-{0,1}
74b1de
-TEST $CLI volume set $V0 cluster.nufa on
74b1de
-
74b1de
-function volinfo_field()
74b1de
-{
74b1de
-    local vol=$1;
74b1de
-    local field=$2;
74b1de
-
74b1de
-    $CLI volume info $vol | grep "^$field: " | sed 's/.*: //';
74b1de
-}
74b1de
-
74b1de
-
74b1de
-## Verify volume is created
74b1de
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
74b1de
-EXPECT 'Created' volinfo_field $V0 'Status';
74b1de
-
74b1de
-## Start volume and verify
74b1de
-TEST $CLI volume start $V0;
74b1de
-EXPECT 'Started' volinfo_field $V0 'Status';
74b1de
-
74b1de
-## Mount native
74b1de
-special_option="--xlator-option ${V0}-dht.local-volume-name=${V0}-client-1"
74b1de
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $special_option $M0
74b1de
-
74b1de
-## Create a bunch of test files.
74b1de
-for i in $(seq 0 99); do
74b1de
-	echo hello > $(printf $M0/file%02d $i)
74b1de
-done
74b1de
-
74b1de
-## Make sure the files went to the right place.  There might be link files in
74b1de
-## the other brick, but they won't have any contents.
74b1de
-EXPECT "0" count_lines hello ${B0}/${V0}-0
74b1de
-EXPECT "100" count_lines hello ${B0}/${V0}-1
74b1de
-
74b1de
-if [ "$EXIT_EARLY" = "1" ]; then
74b1de
-	exit 0;
74b1de
-fi
74b1de
-
74b1de
-## Finish up
74b1de
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
74b1de
-TEST $CLI volume stop $V0;
74b1de
-EXPECT 'Stopped' volinfo_field $V0 'Status';
74b1de
-
74b1de
-TEST $CLI volume delete $V0;
74b1de
-TEST ! $CLI volume info $V0;
74b1de
-
74b1de
-cleanup;
74b1de
-- 
74b1de
1.8.3.1
74b1de