From patchwork Thu Jun 28 09:35:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arushi Singhal X-Patchwork-Id: 936020 X-Patchwork-Delegate: fw@strlen.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HuSyP0SL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41GZRH6tjzz9ryk for ; Thu, 28 Jun 2018 19:36:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934998AbeF1Jg0 (ORCPT ); Thu, 28 Jun 2018 05:36:26 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:44548 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933896AbeF1JgZ (ORCPT ); Thu, 28 Jun 2018 05:36:25 -0400 Received: by mail-pf0-f196.google.com with SMTP id j3-v6so2336606pfh.11 for ; Thu, 28 Jun 2018 02:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=LuuQ1a5uXIXGQXYROoDqli0iEaqGSsPpy4ZQYiOt9QY=; b=HuSyP0SLdC3v+7ExZeXt+VD9xh6rh9/cFZQ01JQb5NYH/oZbfx+BOin8cbNI+qQtYD QTs1g/7Sue3BiuwsqrflGW0ERxfocVbhbUt9aaXUGI1mr8+V0rK7I1fY+iC6u22PM2KQ wvqQAcI4bGT35wK1h9DYO/yuDCD5GZLEHimohwZmyZtvuPfoePiet2CCFO6xmV7oGig/ Y/N1PfzTUmwuyqp53KSpc2nSnD1InOZZr/sYC8iVeO+xxseN99SIZWU1/tXROlrEojlR MkiBE+fdhrK951M1/lIxfefzaR3ADs7Cb1/kvrgfvZuodaWbcvmdXE3t7z5/a8kDh/7j VQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LuuQ1a5uXIXGQXYROoDqli0iEaqGSsPpy4ZQYiOt9QY=; b=VK3gnHF6jdVO7dUboAvAn26hX/HoLQg8M3MhY+K+Rz2eYdM66PBwW7XB3FCIg0Jz7N kFnqZCdg4HswVRwT16wWe4fp7k/aEO2cq8z7zn51jUFgGzjrfZ0LoBKlCjSurPfcnV0g VkLKKRatLdG+IntNROSW96I6ctAEQ44o9L0rO1plig7a0EobNM4MYfisi5bZpu7Ey74s hx/RmiHLxP6SCSJffFRyoT8YFEghRfsPV2KD2Aw6uYMXdiLkDAeKgF5lwbeAlQ6Hl+p3 ACrDdSuZgwHxgK6cBGxzz8X0gxUej+N+5dQYlkXic/7fCfD284yRhyWy75ijyvwQ2o0A VFXQ== X-Gm-Message-State: APt69E2Sslhorro9gOm6xplzBlEq4ibL/lFmhznrXidPxKdEMEZMQOP2 nnx7bnyvDHnWP4mKmS+xGmhGUbPw X-Google-Smtp-Source: ADUXVKJMjWuehBh1F1Ii1BAMAB55p3myvztygl4lqp+aMTdbIG3QwwLiFm0jgmggx/A+EEpk5NlQXA== X-Received: by 2002:a65:6616:: with SMTP id w22-v6mr8243104pgv.332.1530178584677; Thu, 28 Jun 2018 02:36:24 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5383:fc81:7129:acab:adbf:b7f8]) by smtp.googlemail.com with ESMTPSA id 63-v6sm10072689pgi.66.2018.06.28.02.36.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jun 2018 02:36:24 -0700 (PDT) From: Arushi Singhal To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Arushi Singhal Subject: [PATCH 1/2] iptables: tests: shell: Add README Date: Thu, 28 Jun 2018 15:05:39 +0530 Message-Id: <1530178540-4120-1-git-send-email-arushisinghal19971997@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org README added Signed-off-by: Arushi Singhal --- iptables/tests/shell/README | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 iptables/tests/shell/README diff --git a/iptables/tests/shell/README b/iptables/tests/shell/README new file mode 100644 index 0000000..fb3a21a --- /dev/null +++ b/iptables/tests/shell/README @@ -0,0 +1,20 @@ +To run the test suite (as root): + % cd iptables/tests/shell + % ./run-tests.sh + +Test files are executables files with the pattern <> , where +N is the expected return code of the executable. Since they are +located with `find', test-files can be spreaded in any sub-directories. + +You can turn on a verbose execution by calling: + % ./run-tests.sh -v + +And to run test suite for pariticular test files: + % ./run-tests.sh + +Before each call to the test-files, `kernel_cleanup' will be called. +Also, test-files will receive the environment variable $IPTABLES which +contains the path to the iptables binary being tested. + +You can pass an arbitrary $IPTABLES value as well: + % IPTABLES=/../../xtables-multi iptables ./run-tests.sh From patchwork Thu Jun 28 09:35:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arushi Singhal X-Patchwork-Id: 936021 X-Patchwork-Delegate: fw@strlen.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gr5RYpV+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41GZRK39Cjz9ryk for ; Thu, 28 Jun 2018 19:36:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935020AbeF1Jg3 (ORCPT ); Thu, 28 Jun 2018 05:36:29 -0400 Received: from mail-pl0-f42.google.com ([209.85.160.42]:37700 "EHLO mail-pl0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933896AbeF1Jg1 (ORCPT ); Thu, 28 Jun 2018 05:36:27 -0400 Received: by mail-pl0-f42.google.com with SMTP id 31-v6so2499542plc.4 for ; Thu, 28 Jun 2018 02:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=q/XNjeIRdhArseqfUgvQBQ2iV1X+etrseSTqOTYNYqE=; b=gr5RYpV+bQ1KV9lMzIAr7eU3iWNEsc/JdtXt+Rq1LGhK/iH7efMfejHt9ZZXuvbpOr RLZGiM4XuQNNwlVnWSCpS9L5iavyuK3GXLkn4xyGC6fBqOSJoM5DpbYEkD6auGTb5Gdm baT3rKyOlVB4qEOB70mzwlqMy2JXgGESJxRLRErXVfEeTnn9fkuetHWnmbyZl3OJlMNR 3AOwEiMCqyfKtNuTaBA+jl1IMGQ7SwpZH/WIjt7j+7muY+7coD52HvbT1W0TF9urGAWM L0zq+WTHfQIXU1NHX7/WBkacd5tZ1d0+B7p8Miwd4/old/W/2fHCo2mnOQbkJ4FS2Hfc 0TjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=q/XNjeIRdhArseqfUgvQBQ2iV1X+etrseSTqOTYNYqE=; b=G+rPBRwP9zGO0klX+IFcX52cw8cWbobYchMYO3vU+BoAUrWO1nsJZZ+xX+dBhdtttg 7yP0Jxp/5UBb69Dp8hSY3hRBnpgN2DFI5tjYBTbl5K//MUnL3JE2896cvI+Pv+TY5CTo WIgw5tBRAFXItztZJWIK0BwP4243DfBFOjl7kabGVsHiGK1zH36YwNRG2P4Qw1so3ip1 GPp70cqgQJ60C0DpRU/ZfXEAHGRy2YkQbyp5PTEpg7e9bRdTVtjVKyZWX4f2rFvvp1nN aN1Mz3oXMYJ/93jeVZgAK4BVHmnEi5ADQfNu1D0Yv8B1rudLaQTEESFjpzTVQGmvXzoP u4Uw== X-Gm-Message-State: APt69E0GS/Tuq1ZP/8tw7p0AvmvYsoZMdfiKoU3FtDUwMsODTKxrwGVf 0Kwg72pigicAqQomRjGyJSnuzVtM X-Google-Smtp-Source: ADUXVKLWyYAs+diOMpZDZV+sQw4tT25K/CnOtvVw1Iq3roZ5VzNVvdrSKRzk906rL6KoDJGWFtoJBw== X-Received: by 2002:a17:902:2809:: with SMTP id e9-v6mr9652349plb.89.1530178586892; Thu, 28 Jun 2018 02:36:26 -0700 (PDT) Received: from localhost.localdomain ([2405:204:5383:fc81:7129:acab:adbf:b7f8]) by smtp.googlemail.com with ESMTPSA id 63-v6sm10072689pgi.66.2018.06.28.02.36.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jun 2018 02:36:26 -0700 (PDT) From: Arushi Singhal To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Arushi Singhal Subject: [PATCH 2/2] iptables: tests: shell: Add testcase and update shell test-suite Date: Thu, 28 Jun 2018 15:05:40 +0530 Message-Id: <1530178540-4120-2-git-send-email-arushisinghal19971997@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530178540-4120-1-git-send-email-arushisinghal19971997@gmail.com> References: <1530178540-4120-1-git-send-email-arushisinghal19971997@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Test is added for iptables-restore with no option. Shell test-suite is updated for new tests. Signed-off-by: Arushi Singhal --- iptables/tests/shell/run-tests.sh | 8 ++++-- .../save-restore/0001_restore_no_option_0 | 30 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100755 iptables/tests/shell/testcases/save-restore/0001_restore_no_option_0 diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh index cf5cbdc..2cfa79d 100755 --- a/iptables/tests/shell/run-tests.sh +++ b/iptables/tests/shell/run-tests.sh @@ -5,6 +5,7 @@ TESTDIR="./$(dirname $0)/" RETURNCODE_SEPARATOR="_" XTABLES_MULTI="$(dirname $0)/../../xtables-multi" DIFF=$(which diff) +RETURNCODE_SEPARATOR="_" msg_error() { echo "E: $1 ..." >&2 @@ -96,11 +97,14 @@ do for it in iptables ip6tables; do kernel_cleanup - rc_spec=`echo $(basename ${testfile}) | cut -d _ -f2-` + rc_spec=$(awk -F${RETURNCODE_SEPARATOR} '{print $NF}' <<< $testfile) + IPTABLES="$XTABLES_MULTI $it" + IPTABLES_SAVE="$XTABLES_MULTI "$it"-save" + IPTABLES_RESTORE="$XTABLES_MULTI "$it"-restore" msg_info "[EXECUTING] $testfile" - test_output=$(IPTABLES=$IPTABLES ${testfile} 2>&1) + test_output=$(IPTABLES=$IPTABLES IPTABLES_SAVE=$IPTABLES_SAVE IPTABLES_RESTORE=$IPTABLES_RESTORE ${testfile} 2>&1) rc_got=$? echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line diff --git a/iptables/tests/shell/testcases/save-restore/0001_restore_no_option_0 b/iptables/tests/shell/testcases/save-restore/0001_restore_no_option_0 new file mode 100755 index 0000000..4de285b --- /dev/null +++ b/iptables/tests/shell/testcases/save-restore/0001_restore_no_option_0 @@ -0,0 +1,30 @@ +#!/bin/bash + +set -e + +DIFF=$(which diff) + +$IPTABLES -N FOO +$IPTABLES -I INPUT +$IPTABLES -I FOO +$IPTABLES -I FOO +$IPTABLES -L > temp +$IPTABLES_SAVE > A +$IPTABLES_RESTORE < A +$IPTABLES -N BAR +$IPTABLES -A BAR +$IPTABLES_RESTORE < A +$IPTABLES -L > temp1 + +if $DIFF temp temp1 >/dev/null ; then + rm -f temp + rm -f temp1 + rm -f A + exit 0 +else + echo "$test_output" + rm -f temp + rm -f temp1 + rm -f A + exit 1 +fi