From patchwork Tue Jun 19 21:46:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Leblond X-Patchwork-Id: 931859 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=regit.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 419M5N5lZWz9s3R for ; Wed, 20 Jun 2018 07:47:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967205AbeFSVru (ORCPT ); Tue, 19 Jun 2018 17:47:50 -0400 Received: from home.regit.org ([37.187.126.138]:53362 "EHLO home.regit.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967338AbeFSVr0 (ORCPT ); Tue, 19 Jun 2018 17:47:26 -0400 Received: from [2a01:e35:2fb6:1160:a115:3711:d77b:3dea] (helo=localhost.localdomain) by home.regit.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1fVOTD-00014i-Vc; Tue, 19 Jun 2018 23:47:24 +0200 From: Eric Leblond To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Phil Sutter , Eric Leblond Subject: [PATCH nft v2 7/7] tests/py: minor cleaning Date: Tue, 19 Jun 2018 23:46:56 +0200 Message-Id: <20180619214656.25636-8-eric@regit.org> X-Mailer: git-send-email 2.18.0.rc2 In-Reply-To: <20180619214656.25636-1-eric@regit.org> References: <9fdfaa849a662a7a1e31d9887a9168992913083a.camel@regit.org> <20180619214656.25636-1-eric@regit.org> Reply-To: 9fdfaa849a662a7a1e31d9887a9168992913083a.camel@regit.org X-Spam-Score: -1.0 (-) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Move import and use explicit parameter in object creation. Acked-by: Phil Sutter :) --- tests/py/nft-test.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py index c02294a..fdc1cd5 100755 --- a/tests/py/nft-test.py +++ b/tests/py/nft-test.py @@ -19,6 +19,10 @@ import argparse import signal import json +sys.path.insert(0,'../../py/') + +from nftables import Nftables + TESTS_PATH = os.path.dirname(os.path.abspath(__file__)) TESTS_DIRECTORY = ["any", "arp", "bridge", "inet", "ip", "ip6"] LOGFILE = "/tmp/nftables-test.log" @@ -1329,7 +1333,6 @@ def main(): os.chdir(TESTS_PATH + "/../..") sys.path.append('py/') - from nftables import Nftables if not os.path.exists('src/.libs/libnftables.so'): print "The nftables library does not exist. " \ @@ -1337,7 +1340,7 @@ def main(): return global nftables - nftables = Nftables('src/.libs/libnftables.so') + nftables = Nftables(sofile = 'src/.libs/libnftables.so') test_files = files_ok = run_total = 0 tests = passed = warnings = errors = 0