From 71caf1423fe5f0eed652210f8158c95fc8a10219 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Fri, 12 Apr 2019 08:16:56 +0530
Subject: tests: add tests for different signal handling

Also some cleanup:
* old-protocol.t was actually added to make sure we have line-coverage
* first-test.t should have been removed as per the comment. It doesn't do anything.
* add statvfs to rpc-coverage so we can cover statvfs in few xlators.

updates: bz#1693692
Change-Id: Ie8651ce007de484c4abced16b4de765aa5e517be
Signed-off-by: Amar Tumballi <amarts@redhat.com>
---
 tests/basic/first-test.t    | 10 ----------
 tests/basic/old-protocol.t  | 31 -------------------------------
 tests/basic/rpc-coverage.sh |  6 ++++++
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100755 tests/basic/first-test.t
 delete mode 100755 tests/basic/old-protocol.t

(limited to 'tests/basic')

diff --git a/tests/basic/first-test.t b/tests/basic/first-test.t
deleted file mode 100755
index 535b269e6b3..00000000000
--- a/tests/basic/first-test.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cat << EOF
-This test should run first for http://review.gluster.org/#/c/13439/ and should
-be removed once that patch has been merged.
-EOF
-
-TEST true
diff --git a/tests/basic/old-protocol.t b/tests/basic/old-protocol.t
deleted file mode 100755
index 27a688d3538..00000000000
--- a/tests/basic/old-protocol.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-. $(dirname $0)/../volume.rc
-
-cleanup;
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-
-TEST $CLI volume create $V0 replica 3  $H0:$B0/${V0}{1,2,3,4,5,6};
-
-EXPECT "$V0" volinfo_field $V0 'Volume Name';
-EXPECT 'Created' volinfo_field $V0 'Status';
-EXPECT '6' brick_count $V0
-
-TEST $CLI volume start $V0;
-EXPECT 'Started' volinfo_field $V0 'Status';
-
-file="/var/lib/glusterd/vols/$V0/trusted-$V0.tcp-fuse.vol"
-sed -i -e 's$send-gids true$send-gids true\n    option testing.old-protocol true$g' $file
-
-## Mount FUSE
-TEST $GFS -s $H0 --volfile-id $V0 $M1;
-
-## TODO: best way to increase coverage is to have a gfapi program
-## which covers maximum fops
-TEST $(dirname $0)/rpc-coverage.sh $M1
-
-cleanup;
diff --git a/tests/basic/rpc-coverage.sh b/tests/basic/rpc-coverage.sh
index 4b6759a59eb..ad145559c41 100755
--- a/tests/basic/rpc-coverage.sh
+++ b/tests/basic/rpc-coverage.sh
@@ -419,9 +419,15 @@ function test_rmdir()
     rm -rf $PFX || fail "rm -rf"
 }
 
+function test_statvfs()
+{
+    df $DIR 2>&1 || fail "df"
+}
+
 
 function run_tests()
 {
+    test_statvfs;
     test_mkdir;
     test_create;
     test_statfs;
-- 
cgit