From owner-svn-src-all@freebsd.org Sun Oct 27 17:03:57 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B2FE17ECB5; Sun, 27 Oct 2019 17:03:57 +0000 (UTC) (envelope-from SRS0=VToT=YU=vega.codepro.be=kp@codepro.be) Received: from mercury.codepro.be (mercury.codepro.be [IPv6:2001:4b98:dc0:41:216:3eff:fe31:eda8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "monitoring.codepro.be", Issuer "Let's Encrypt Authority X3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 471PMK1pM9z3QV7; Sun, 27 Oct 2019 17:03:56 +0000 (UTC) (envelope-from SRS0=VToT=YU=vega.codepro.be=kp@codepro.be) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) by mercury.codepro.be (Postfix) with ESMTPS id C98719048D; Sun, 27 Oct 2019 17:02:21 +0000 (UTC) Received: from vega.codepro.be (unknown [172.16.1.3]) by venus.codepro.be (Postfix) with ESMTP id 5A85623381; Sun, 27 Oct 2019 18:03:54 +0100 (CET) Received: by vega.codepro.be (Postfix, from userid 1001) id 550A6538FE; Sun, 27 Oct 2019 18:03:54 +0100 (CET) Date: Sun, 27 Oct 2019 18:03:54 +0100 From: Kristof Provost To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r354121 - in head/tests/sys/netpfil: common pf Message-ID: <20191027170354.GA10284@vega.codepro.be> References: <201910262119.x9QLJtF2086963@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201910262119.x9QLJtF2086963@repo.freebsd.org> X-Checked-By-NSA: Probably User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 471PMK1pM9z3QV7 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.990,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2019 17:03:57 -0000 On 2019-10-26 21:19:55 (+0000), Bjoern A. Zeeb wrote: > Author: bz > Date: Sat Oct 26 21:19:55 2019 > New Revision: 354121 > URL: https://svnweb.freebsd.org/changeset/base/354121 > > Log: > Upgrade (scapy) py2 tests to work on py3. > > In order to move python2 out of the test framework to avoid py2 vs. py3 > confusions upgrade the remaining test cases using scapy to work with py3. > That means only one version of scapy needs to be installed in the CI system. > It also gives a path forward for testing i386 issues observed in the CI > system with some of these tests. > > Fixes are: > - Use default python from environment (which is 3.x these days). > - properly ident some lines as common for the rest of the file to avoid > errors. > - cast the calculated offset to an int as the division result is considered > a float which is not accepted input. > - when comparing payload to a magic number make sure we always add the > payload properly to the packet and do not try to compare string in > the result but convert the data payload back into an integer. > - fix print formating. > > Discussed with: lwhsu, kp (taking it off his todo :) Thank you! Kristof