tests: Run black on pytest changes

I used sed to get the pytest changes in place, run black to get the formatting right. Signed-off-by: Donald Sharp <[email protected]>
FRRouting · Jul 31, 2024 · 4c812c7 · 4c812c7
1 parent 5379770
commit 4c812c7
Show file tree

Hide file tree

Showing 174 changed files with 997 additions and 335 deletions.
diff --git a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py
@@ -21,7 +21,8 @@
 import glob
 from time import sleep
 
-pytestmark = [pytest.mark.random_order(disabled=True),
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
     pytest.mark.babeld,
     pytest.mark.bgpd,
     pytest.mark.isisd,

diff --git a/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py b/tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py
@@ -28,7 +28,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.bfdd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.bfdd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py b/tests/topotests/bfd_isis_topo1/test_bfd_isis_topo1.py
@@ -71,7 +71,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.isisd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.isisd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_ospf_topo1/test_bfd_ospf_topo1.py b/tests/topotests/bfd_ospf_topo1/test_bfd_ospf_topo1.py
@@ -71,7 +71,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.ospfd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.py b/tests/topotests/bfd_profiles_topo1/test_bfd_profiles_topo1.py
@@ -29,7 +29,13 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd, pytest.mark.isisd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+    pytest.mark.isisd,
+    pytest.mark.ospfd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_topo1/test_bfd_topo1.py b/tests/topotests/bfd_topo1/test_bfd_topo1.py
@@ -29,7 +29,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_topo2/test_bfd_topo2.py b/tests/topotests/bfd_topo2/test_bfd_topo2.py
@@ -30,7 +30,12 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+    pytest.mark.ospfd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_topo3/test_bfd_topo3.py b/tests/topotests/bfd_topo3/test_bfd_topo3.py
@@ -29,7 +29,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def setup_module(mod):

diff --git a/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.py b/tests/topotests/bfd_vrf_topo1/test_bfd_vrf_topo1.py
@@ -32,7 +32,11 @@
 
 # Required to instantiate the topology builder class.
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def build_topo(tgen):

diff --git a/tests/topotests/bfd_vrflite_topo1/test_bfd_vrflite_topo1.py b/tests/topotests/bfd_vrflite_topo1/test_bfd_vrflite_topo1.py
@@ -32,7 +32,11 @@
 
 # Required to instantiate the topology builder class.
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def build_topo(tgen):

diff --git a/tests/topotests/bgp_6vpe_ebgp_topo1/test_bgp_6vpe_ebgp_topo1.py b/tests/topotests/bgp_6vpe_ebgp_topo1/test_bgp_6vpe_ebgp_topo1.py
@@ -26,7 +26,11 @@
 from lib.topolog import logger
 from lib.checkping import check_ping
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.isisd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.isisd,
+]
 
 
 def build_topo(tgen):

diff --git a/tests/topotests/bgp_always_compare_med/test_bgp_always_compare_med_topo1.py b/tests/topotests/bgp_always_compare_med/test_bgp_always_compare_med_topo1.py
@@ -55,7 +55,11 @@
 from lib.bgp import verify_bgp_convergence, verify_bgp_rib, create_router_bgp, clear_bgp
 from lib.topojson import build_config_from_json
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Reading the data from JSON File for topology creation
 topo = None

diff --git a/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py b/tests/topotests/bgp_as_allow_in/test_bgp_as_allow_in.py
@@ -60,7 +60,11 @@
 )
 from lib.topojson import build_config_from_json
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Global variables
 BGP_CONVERGENCE = False

diff --git a/tests/topotests/bgp_auth/test_bgp_auth1.py b/tests/topotests/bgp_auth/test_bgp_auth1.py
@@ -50,7 +50,11 @@
 )
 from lib.topogen import Topogen, TopoRouter, get_topogen
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.ospfd,
+]
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/tests/topotests/bgp_auth/test_bgp_auth2.py b/tests/topotests/bgp_auth/test_bgp_auth2.py
@@ -50,7 +50,11 @@
 )
 from lib.topogen import Topogen, TopoRouter, get_topogen
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.ospfd,
+]
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/tests/topotests/bgp_auth/test_bgp_auth3.py b/tests/topotests/bgp_auth/test_bgp_auth3.py
@@ -49,7 +49,11 @@
 )
 from lib.topogen import Topogen, TopoRouter, get_topogen
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.ospfd,
+]
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/tests/topotests/bgp_auth/test_bgp_auth4.py b/tests/topotests/bgp_auth/test_bgp_auth4.py
@@ -49,7 +49,11 @@
 )
 from lib.topogen import Topogen, TopoRouter, get_topogen
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.ospfd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.ospfd,
+]
 
 CWD = os.path.dirname(os.path.realpath(__file__))
 

diff --git a/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py b/tests/topotests/bgp_basic_functionality_topo1/test_bgp_basic_functionality.py
@@ -78,7 +78,11 @@
 from lib.topojson import build_config_from_json
 from lib.topolog import logger
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 
 # Global Variable

diff --git a/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py b/tests/topotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification.py
@@ -27,7 +27,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.common_config import kill_router_daemons, step
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def build_topo(tgen):

diff --git a/...opotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification_shutdown.py b/...opotests/bgp_bfd_down_cease_notification/test_bgp_bfd_down_cease_notification_shutdown.py
@@ -27,7 +27,11 @@
 from lib.topogen import Topogen, TopoRouter, get_topogen
 from lib.common_config import kill_router_daemons, step
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bfdd, pytest.mark.bgpd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bfdd,
+    pytest.mark.bgpd,
+]
 
 
 def build_topo(tgen):

diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities.py
@@ -50,7 +50,11 @@
 from lib.topojson import build_config_from_json
 from copy import deepcopy
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 
 # Global variables

diff --git a/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py b/tests/topotests/bgp_communities_topo1/test_bgp_communities_topo2.py
@@ -52,7 +52,11 @@
 )
 from lib.topojson import build_config_from_json
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 
 # Global variables

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_1.py
@@ -54,7 +54,11 @@
 )
 
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_2.py
@@ -57,7 +57,11 @@
 )
 
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))

diff --git a/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py b/tests/topotests/bgp_default_originate/test_bgp_default_originate_topo1_3.py
@@ -56,7 +56,11 @@
     check_router_status,
 )
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))

diff --git a/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py b/tests/topotests/bgp_default_originate/test_default_orginate_vrf.py
@@ -43,7 +43,11 @@
     check_router_status,
 )
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Save the Current Working Directory to find configuration files.
 CWD = os.path.dirname(os.path.realpath(__file__))

diff --git a/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py b/tests/topotests/bgp_default_originate/test_default_originate_conditional_routemap.py
@@ -61,7 +61,11 @@
 sys.path.append(os.path.join(CWD, "../"))
 sys.path.append(os.path.join(CWD, "../lib/"))
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 # Required to instantiate the topology builder class.
 

diff --git a/tests/topotests/bgp_distance_change/test_bgp_admin_dist.py b/tests/topotests/bgp_distance_change/test_bgp_admin_dist.py
@@ -103,7 +103,11 @@
 # Global variables
 topo = None
 bgp_convergence = False
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 NETWORK = {
     "ipv4": [

diff --git a/tests/topotests/bgp_distance_change/test_bgp_admin_dist_vrf.py b/tests/topotests/bgp_distance_change/test_bgp_admin_dist_vrf.py
@@ -88,7 +88,11 @@
 # Global variables
 topo = None
 bgp_convergence = False
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 NETWORK = {
     "ipv4": [

diff --git a/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py b/tests/topotests/bgp_ecmp_topo2/test_ebgp_ecmp_topo2.py
@@ -53,7 +53,11 @@
 from lib.topojson import build_config_from_json
 
 
-pytestmark = [pytest.mark.random_order(disabled=True), pytest.mark.bgpd, pytest.mark.staticd]
+pytestmark = [
+    pytest.mark.random_order(disabled=True),
+    pytest.mark.bgpd,
+    pytest.mark.staticd,
+]
 
 
 # Global variables