git: fa8dd3566e32 - stable/12 - tests: Only log critical errors from scapy

Kristof Provost kp at FreeBSD.org
Tue May 18 12:18:45 UTC 2021 

The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=fa8dd3566e3280aaa62bb5564ce8a3b600b65597

commit fa8dd3566e3280aaa62bb5564ce8a3b600b65597
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-05-12 17:13:40 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-05-18 12:17:47 +0000

    tests: Only log critical errors from scapy
    
    Since 2.4.5 scapy started issuing warnings about a few different
    configurations during our tests. These are harmless, but they generate
    stderr output, which upsets atf_check.
    
    Configure scapy to only log critical errors (and thus not warnings) to
    fix these tests.
    
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit a26e895f3d803cc1f4ee1c2b33c61330998808b9)
---
 tests/sys/net/stp.py                  | 2 ++
 tests/sys/netinet6/exthdr.py          | 2 ++
 tests/sys/netinet6/frag6/frag6_01.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_02.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_03.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_04.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_05.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_06.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_07.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_08.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_09.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_10.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_11.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_12.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_13.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_14.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_15.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_16.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_17.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_18.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_19.py  | 2 ++
 tests/sys/netinet6/frag6/frag6_20.py  | 2 ++
 tests/sys/netinet6/frag6/sniffer.py   | 2 ++
 tests/sys/netinet6/mld.py             | 2 ++
 tests/sys/netinet6/scapyi386.py       | 2 ++
 tests/sys/netpfil/common/pft_ping.py  | 2 ++
 tests/sys/netpfil/pf/CVE-2019-5597.py | 2 ++
 tests/sys/netpfil/pf/CVE-2019-5598.py | 2 ++
 28 files changed, 56 insertions(+)

diff --git a/tests/sys/net/stp.py b/tests/sys/net/stp.py
index 4c4c0af4c728..3e7d011efdd1 100644
--- a/tests/sys/net/stp.py
+++ b/tests/sys/net/stp.py
@@ -27,6 +27,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import sys
 import os
diff --git a/tests/sys/netinet6/exthdr.py b/tests/sys/netinet6/exthdr.py
index 7c09f44c5b58..52739a9cfa11 100644
--- a/tests/sys/netinet6/exthdr.py
+++ b/tests/sys/netinet6/exthdr.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_01.py b/tests/sys/netinet6/frag6/frag6_01.py
index 5a6b327337c6..efa99ce65759 100644
--- a/tests/sys/netinet6/frag6/frag6_01.py
+++ b/tests/sys/netinet6/frag6/frag6_01.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_02.py b/tests/sys/netinet6/frag6/frag6_02.py
index 945b428c3dac..794801b4a819 100644
--- a/tests/sys/netinet6/frag6/frag6_02.py
+++ b/tests/sys/netinet6/frag6/frag6_02.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_03.py b/tests/sys/netinet6/frag6/frag6_03.py
index 341de7915bd8..434dfe554a5a 100644
--- a/tests/sys/netinet6/frag6/frag6_03.py
+++ b/tests/sys/netinet6/frag6/frag6_03.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_04.py b/tests/sys/netinet6/frag6/frag6_04.py
index 6c35d4858ccb..8f0a20e003da 100644
--- a/tests/sys/netinet6/frag6/frag6_04.py
+++ b/tests/sys/netinet6/frag6/frag6_04.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_05.py b/tests/sys/netinet6/frag6/frag6_05.py
index d67c35581bbf..f9bc947d5465 100644
--- a/tests/sys/netinet6/frag6/frag6_05.py
+++ b/tests/sys/netinet6/frag6/frag6_05.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_06.py b/tests/sys/netinet6/frag6/frag6_06.py
index 42c8b02042cd..ca4e9b1a5ca0 100644
--- a/tests/sys/netinet6/frag6/frag6_06.py
+++ b/tests/sys/netinet6/frag6/frag6_06.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_07.py b/tests/sys/netinet6/frag6/frag6_07.py
index c84a783137d3..231f49eac2e0 100644
--- a/tests/sys/netinet6/frag6/frag6_07.py
+++ b/tests/sys/netinet6/frag6/frag6_07.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_08.py b/tests/sys/netinet6/frag6/frag6_08.py
index fa17e1e5c774..25f57f702e71 100644
--- a/tests/sys/netinet6/frag6/frag6_08.py
+++ b/tests/sys/netinet6/frag6/frag6_08.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_09.py b/tests/sys/netinet6/frag6/frag6_09.py
index 6e9771bc7d58..63ec646e1175 100644
--- a/tests/sys/netinet6/frag6/frag6_09.py
+++ b/tests/sys/netinet6/frag6/frag6_09.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_10.py b/tests/sys/netinet6/frag6/frag6_10.py
index 02d25bd96450..fcd331190c02 100644
--- a/tests/sys/netinet6/frag6/frag6_10.py
+++ b/tests/sys/netinet6/frag6/frag6_10.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_11.py b/tests/sys/netinet6/frag6/frag6_11.py
index a5c8e1918430..6b9643337597 100644
--- a/tests/sys/netinet6/frag6/frag6_11.py
+++ b/tests/sys/netinet6/frag6/frag6_11.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_12.py b/tests/sys/netinet6/frag6/frag6_12.py
index 68ea180599e1..a683782f2b69 100644
--- a/tests/sys/netinet6/frag6/frag6_12.py
+++ b/tests/sys/netinet6/frag6/frag6_12.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_13.py b/tests/sys/netinet6/frag6/frag6_13.py
index da3b2afe239f..e377a4272fa1 100644
--- a/tests/sys/netinet6/frag6/frag6_13.py
+++ b/tests/sys/netinet6/frag6/frag6_13.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_14.py b/tests/sys/netinet6/frag6/frag6_14.py
index 915571cfc36f..b53a65e67529 100644
--- a/tests/sys/netinet6/frag6/frag6_14.py
+++ b/tests/sys/netinet6/frag6/frag6_14.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_15.py b/tests/sys/netinet6/frag6/frag6_15.py
index f9922aaa9717..fff5c1efbe17 100644
--- a/tests/sys/netinet6/frag6/frag6_15.py
+++ b/tests/sys/netinet6/frag6/frag6_15.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_16.py b/tests/sys/netinet6/frag6/frag6_16.py
index 42ac8e2b4675..bf5b78cb6d6b 100644
--- a/tests/sys/netinet6/frag6/frag6_16.py
+++ b/tests/sys/netinet6/frag6/frag6_16.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_17.py b/tests/sys/netinet6/frag6/frag6_17.py
index a4d6deea0a24..b4a1a1898c2e 100644
--- a/tests/sys/netinet6/frag6/frag6_17.py
+++ b/tests/sys/netinet6/frag6/frag6_17.py
@@ -30,6 +30,8 @@
 
 import argparse
 import random as random
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_18.py b/tests/sys/netinet6/frag6/frag6_18.py
index a4d6deea0a24..b4a1a1898c2e 100644
--- a/tests/sys/netinet6/frag6/frag6_18.py
+++ b/tests/sys/netinet6/frag6/frag6_18.py
@@ -30,6 +30,8 @@
 
 import argparse
 import random as random
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_19.py b/tests/sys/netinet6/frag6/frag6_19.py
index 9248f5f40c43..f8613f757573 100644
--- a/tests/sys/netinet6/frag6/frag6_19.py
+++ b/tests/sys/netinet6/frag6/frag6_19.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/frag6_20.py b/tests/sys/netinet6/frag6/frag6_20.py
index 4e935a1f640a..6dd4c2379357 100755
--- a/tests/sys/netinet6/frag6/frag6_20.py
+++ b/tests/sys/netinet6/frag6/frag6_20.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/frag6/sniffer.py b/tests/sys/netinet6/frag6/sniffer.py
index 2c5f460488db..7e1d283dbf91 100644
--- a/tests/sys/netinet6/frag6/sniffer.py
+++ b/tests/sys/netinet6/frag6/sniffer.py
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
 import threading
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 
 class Sniffer(threading.Thread):
diff --git a/tests/sys/netinet6/mld.py b/tests/sys/netinet6/mld.py
index b1fcf2f8e50a..1f43cee5d6ad 100644
--- a/tests/sys/netinet6/mld.py
+++ b/tests/sys/netinet6/mld.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netinet6/scapyi386.py b/tests/sys/netinet6/scapyi386.py
index 745c01b45881..ac0c877380c4 100644
--- a/tests/sys/netinet6/scapyi386.py
+++ b/tests/sys/netinet6/scapyi386.py
@@ -29,6 +29,8 @@
 #
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py
index 8c47df24ea0d..a0ca66742f77 100644
--- a/tests/sys/netpfil/common/pft_ping.py
+++ b/tests/sys/netpfil/common/pft_ping.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import socket
 import sys
diff --git a/tests/sys/netpfil/pf/CVE-2019-5597.py b/tests/sys/netpfil/pf/CVE-2019-5597.py
index 68579e99590c..6ba56e33ff91 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5597.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5597.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
 import random
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import sys
 
diff --git a/tests/sys/netpfil/pf/CVE-2019-5598.py b/tests/sys/netpfil/pf/CVE-2019-5598.py
index 1a2619f7e52f..5e997a34f9be 100644
--- a/tests/sys/netpfil/pf/CVE-2019-5598.py
+++ b/tests/sys/netpfil/pf/CVE-2019-5598.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
 import argparse
+import logging
+logging.getLogger("scapy").setLevel(logging.CRITICAL)
 import scapy.all as sp
 import sys
 from sniffer import Sniffer

More information about the dev-commits-src-branches mailing list