From patchwork Mon Sep 5 18:20:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manuel Johannes Messner X-Patchwork-Id: 665983 X-Patchwork-Delegate: fw@strlen.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sSdWC6sXMz9ryk for ; Tue, 6 Sep 2016 04:27:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932214AbcIES1d (ORCPT ); Mon, 5 Sep 2016 14:27:33 -0400 Received: from mx.rz.hs-furtwangen.de ([141.28.2.11]:39109 "HELO mx.rz.hs-furtwangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754731AbcIES1d (ORCPT ); Mon, 5 Sep 2016 14:27:33 -0400 Received: from mx.rz.hs-furtwangen.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 381ED7E3A3; Mon, 5 Sep 2016 20:20:24 +0200 (CEST) Received: from mail.rz.hs-furtwangen.de (mail.rz.hs-furtwangen.de [141.28.2.16]) by mx.rz.hs-furtwangen.de (Postfix) with ESMTP id 0336A7E362; Mon, 5 Sep 2016 20:20:23 +0200 (CEST) Received: from nightmare.hs-furtwangen.de (hfuplan164.hfu-poollan.hs-furtwangen.de [141.28.8.164]) by mail.rz.hs-furtwangen.de (Postfix) with ESMTPA id 5E78EA0079D; Mon, 5 Sep 2016 20:20:39 +0200 (CEST) From: Manuel Johannes Messner To: netfilter-devel@vger.kernel.org Cc: fw@strlen.de, messnera@hs-furtwangen.de Subject: [PATCH 3/3] tests: py: any: Remove duplicate tests Date: Mon, 5 Sep 2016 20:20:14 +0200 Message-Id: <20160905182014.8762-4-manuel.johannes.messner@hs-furtwangen.de> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160905182014.8762-1-manuel.johannes.messner@hs-furtwangen.de> References: <20160905182014.8762-1-manuel.johannes.messner@hs-furtwangen.de> X-PMX-Version: 6.2.1.2493963, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.9.5.173317 X-PMX-NoSpam: Spam checked by mx.rz.hs-furtwangen.de [Spam-Wahrscheinlichkeit=8%] Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This commit removes some duplicated tests. Signed-off-by: Manuel Johannes Messner --- tests/py/any/meta.t | 3 --- tests/py/any/meta.t.payload | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index 852ef82..a1249e8 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -66,8 +66,6 @@ meta mark xor 0x03 == 0x01;ok;mark 0x00000002 meta mark xor 0x03 != 0x01;ok;mark != 0x00000002 meta iif "lo" accept;ok;iif "lo" accept -meta iif "lo" accept;ok;iif "lo" accept -meta iif != "lo" accept;ok;iif != "lo" accept meta iif != "lo" accept;ok;iif != "lo" accept meta iifname "dummy0";ok;iifname "dummy0" @@ -92,7 +90,6 @@ meta oif {"lo"} accept;ok meta oifname "dummy0";ok;oifname "dummy0" meta oifname != "dummy0";ok;oifname != "dummy0" meta oifname { "dummy0", "lo"};ok -- meta iifname != {"dummy0", "lo"};ok meta oifname "dummy*";ok;oifname "dummy*" meta oifname "dummy\*";ok;oifname "dummy\*" diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload index 19cc6ac..5fff76e 100644 --- a/tests/py/any/meta.t.payload +++ b/tests/py/any/meta.t.payload @@ -199,18 +199,6 @@ ip test-ip4 input [ cmp eq reg 1 0x00000001 ] [ immediate reg 0 accept ] -# meta iif "lo" accept -ip test-ip4 input - [ meta load iif => reg 1 ] - [ cmp eq reg 1 0x00000001 ] - [ immediate reg 0 accept ] - -# meta iif != "lo" accept -ip test-ip4 input - [ meta load iif => reg 1 ] - [ cmp neq reg 1 0x00000001 ] - [ immediate reg 0 accept ] - # meta iif != "lo" accept ip test-ip4 input [ meta load iif => reg 1 ]