From patchwork Tue May 8 11:08:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 910131 X-Patchwork-Delegate: pablo@netfilter.org 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=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gGwJ6tcFz9rvt for ; Tue, 8 May 2018 21:09:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752749AbeEHLJg (ORCPT ); Tue, 8 May 2018 07:09:36 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:36710 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbeEHLJf (ORCPT ); Tue, 8 May 2018 07:09:35 -0400 Received: from localhost ([::1]:51986 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.90_1) (envelope-from ) id 1fG0Ux-0003st-0E; Tue, 08 May 2018 13:09:35 +0200 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org Subject: [nft PATCH v3 11/14] tests/py: Simplify parsing of 'set' lines Date: Tue, 8 May 2018 13:08:42 +0200 Message-Id: <20180508110845.26364-12-phil@nwl.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508110845.26364-1-phil@nwl.cc> References: <20180508110845.26364-1-phil@nwl.cc> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Phil Sutter --- tests/py/nft-test.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py index f4ddc91b39291..ef9c6dbb769e5 100755 --- a/tests/py/nft-test.py +++ b/tests/py/nft-test.py @@ -855,19 +855,13 @@ def chain_process(chain_line, lineno): def set_process(set_line, filename, lineno): test_result = set_line[1] - tokens = set_line[0].split(" ") - set_name = tokens[0] - set_type = tokens[2] - - i = 3 - while len(tokens) > i and tokens[i] == ".": - set_type += " . " + tokens[i+1] - i += 2 - - if len(tokens) == i+2 and tokens[i] == "flags": - set_flags = tokens[i+1] + # set_line[0] is like ' type [ flags ]' + tokens = set_line[0].split(" flags ") + if len(tokens) > 1: + set_flags = tokens[1] else: set_flags = "" + set_name, set_type = tokens[0].split(" type ") s = Set("", "", set_name, set_type, set_flags)