From patchwork Thu Sep 5 17:30:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 11133711 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F19A112B for ; Thu, 5 Sep 2019 17:30:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BFDF206A5 for ; Thu, 5 Sep 2019 17:30:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387700AbfIERas (ORCPT ); Thu, 5 Sep 2019 13:30:48 -0400 Received: from mga17.intel.com ([192.55.52.151]:39471 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726231AbfIERas (ORCPT ); Thu, 5 Sep 2019 13:30:48 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 10:30:40 -0700 X-IronPort-AV: E=Sophos;i="5.64,470,1559545200"; d="scan'208";a="188048368" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.157]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Sep 2019 10:30:39 -0700 From: ira.weiny@intel.com To: fstests@vger.kernel.org Cc: john.hubbard@gmail.com, Dave Chinner , Jason Gunthorpe , Jan Kara , Dan Williams , Jeff Layton , Ira Weiny Subject: [PATCH V2 2/2] generic: Add Lease testing Date: Thu, 5 Sep 2019 10:30:26 -0700 Message-Id: <20190905173026.28114-3-ira.weiny@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190905173026.28114-1-ira.weiny@intel.com> References: <20190905173026.28114-1-ira.weiny@intel.com> MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Ira Weiny Now that we have a leasetest executable add in a lease test script. Signed-off-by: Ira Weiny --- tests/generic/567 | 100 ++++++++++++++++++++++++++++++++++++++++++ tests/generic/567.out | 2 + tests/generic/group | 1 + 3 files changed, 103 insertions(+) create mode 100755 tests/generic/567 create mode 100644 tests/generic/567.out diff --git a/tests/generic/567 b/tests/generic/567 new file mode 100755 index 000000000000..3ef99c66b207 --- /dev/null +++ b/tests/generic/567 @@ -0,0 +1,100 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Intel Corp. All Rights Reserved. +# +# FS QA Test 567 +# +# Test Leases +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 +#debug="-d -d -d" +debug="" + +TESTFILE=$TEST_DIR/lease_file + +_cleanup() +{ + kill $leasetest_pid2 > /dev/null 2>&1 + kill $leasetest_pid1 > /dev/null 2>&1 + rm -f $TESTFILE +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs generic +_supported_os Linux +_require_test +_require_test_fcntl_advisory_locks + +# set up log files +SERVER_LOG=$TEST_DIR/server.out +CLIENT_LOG=$TEST_DIR/client.out +rm -f $SERVER_LOG +touch $SERVER_LOG +rm -f $CLIENT_LOG +touch $CLIENT_LOG + +if [ "$debug" != "" ]; then + echo "Test directory : $TEST_DIR" + echo "Result directory : $RESULT_DIR" + echo "Client log : $CLIENT_LOG" + echo "Server log : $SERVER_LOG" +fi + +touch $TESTFILE + +# Start the server +src/leasetest $debug $TESTFILE 2>&1 > $SERVER_LOG & +leasetest_pid1=$! + +timeout=30 +while [ $timeout -gt 0 ]; do + sleep 1 + + PORT=$(cat $SERVER_LOG | grep "^server port: " | awk '{print $3}') + if [ -n "$PORT" ]; then + break + fi + + # check the existence of server process + if ! kill -s 0 $leasetest_pid1 >/dev/null 2>&1; then + echo "Server died abnormally" + exit 1 + fi + + let timeout=timeout-1 +done + +if [ -z "$PORT" ]; then + echo "Could not get server port" + exit 1 +fi + +# Start the client +src/leasetest $debug -p $PORT -h localhost $TESTFILE 2>&1 > $CLIENT_LOG +leasetest_pid2=$! +result=$? +if [ $result -eq 0 ]; then + echo success! + status=0 +else + echo "Client reported failure ($result)" + cat $TEST_DIR/*.out +fi + +if [ "$debug" != "" ]; then + echo "End file details" + ls -la $TESTFILE +fi + +exit diff --git a/tests/generic/567.out b/tests/generic/567.out new file mode 100644 index 000000000000..dada957258fc --- /dev/null +++ b/tests/generic/567.out @@ -0,0 +1,2 @@ +QA output created by 567 +success! diff --git a/tests/generic/group b/tests/generic/group index d26c080fde30..1a48c93ff3bb 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -569,3 +569,4 @@ 564 auto quick copy_range 565 auto quick copy_range 566 auto quick quota metadata +567 auto quick locks