tests: ensure we free pyroute2 resources

diff --git a/tests/integration/fixtures/namespaces.py b/tests/integration/fixtures/namespaces.py
index ad33fd7f157a7cf464b76d0ec01c0ece0746f0be..0ee40d387002556009dd27c96ebe03ca485dab3a 100644 (file)
--- a/tests/integration/fixtures/namespaces.py
+++ b/tests/integration/fixtures/namespaces.py
@@ -161,9 +161,9 @@ class Namespace(object):
 
         # For a network namespace, enable lo
         if 'net' in self.namespaces:
-            ipr = pyroute2.IPRoute()
-            lo = ipr.link_lookup(ifname='lo')[0]
-            ipr.link('set', index=lo, state='up')
+            with pyroute2.IPRoute() as ipr:
+                lo = ipr.link_lookup(ifname='lo')[0]
+                ipr.link('set', index=lo, state='up')
         # For a mount namespace, make it private
         if 'mnt' in self.namespaces:
             libc.mount(b"none", b"/", None,

diff --git a/tests/integration/fixtures/network.py b/tests/integration/fixtures/network.py
index 8796e36044580ea86c6c0bd4f78c0057f86954ae..50f6b128ed84e668bf552fb177d8cb8c13183199 100644 (file)
--- a/tests/integration/fixtures/network.py
+++ b/tests/integration/fixtures/network.py
@@ -36,72 +36,72 @@ class LinksFactory(object):
             # First, create a link
             first = 'eth{}'.format(self.count)
             second = 'eth{}'.format(self.count + 1)
-            ipr = pyroute2.IPRoute()
-            ipr.link('add',
-                     ifname=first,
-                     peer=second,
-                     kind='veth')
-            idx = [ipr.link_lookup(ifname=x)[0]
-                   for x in (first, second)]
-
-            # Set an easy to remember MAC address
-            ipr.link('set', index=idx[0],
-                     address=int_to_mac(self.count + 1))
-            ipr.link('set', index=idx[1],
-                     address=int_to_mac(self.count + 2))
-
-            # Set MTU
-            ipr.link('set', index=idx[0], mtu=mtu)
-            ipr.link('set', index=idx[1], mtu=mtu)
-
-            # Then, move each to the target namespace
-            ipr.link('set', index=idx[0], net_ns_fd=ns1.fd('net'))
-            ipr.link('set', index=idx[1], net_ns_fd=ns2.fd('net'))
+            with pyroute2.IPRoute() as ipr:
+                ipr.link('add',
+                         ifname=first,
+                         peer=second,
+                         kind='veth')
+                idx = [ipr.link_lookup(ifname=x)[0]
+                       for x in (first, second)]
+
+                # Set an easy to remember MAC address
+                ipr.link('set', index=idx[0],
+                         address=int_to_mac(self.count + 1))
+                ipr.link('set', index=idx[1],
+                         address=int_to_mac(self.count + 2))
+
+                # Set MTU
+                ipr.link('set', index=idx[0], mtu=mtu)
+                ipr.link('set', index=idx[1], mtu=mtu)
+
+                # Then, move each to the target namespace
+                ipr.link('set', index=idx[0], net_ns_fd=ns1.fd('net'))
+                ipr.link('set', index=idx[1], net_ns_fd=ns2.fd('net'))
 
             # And put them up
             with ns1:
-                ipr = pyroute2.IPRoute()
-                ipr.link('set', index=idx[0], state='up')
+                with pyroute2.IPRoute() as ipr:
+                    ipr.link('set', index=idx[0], state='up')
             time.sleep(sleep)
             with ns2:
-                ipr = pyroute2.IPRoute()
-                ipr.link('set', index=idx[1], state='up')
+                with pyroute2.IPRoute() as ipr:
+                    ipr.link('set', index=idx[1], state='up')
 
             self.count += 2
 
     def bridge(self, name, *ifaces, filtering=False):
         """Create a bridge."""
-        ipr = pyroute2.IPRoute()
-        # Create the bridge
-        ipr.link('add',
-                 ifname=name,
-                 kind='bridge',
-                 br_vlan_filtering=filtering)
-        idx = ipr.link_lookup(ifname=name)[0]
-        # Attach interfaces
-        for iface in ifaces:
-            port = ipr.link_lookup(ifname=iface)[0]
-            ipr.link('set', index=port, master=idx)
-        # Put the bridge up
-        ipr.link('set', index=idx, state='up')
-        return idx
+        with pyroute2.IPRoute() as ipr:
+            # Create the bridge
+            ipr.link('add',
+                     ifname=name,
+                     kind='bridge',
+                     br_vlan_filtering=filtering)
+            idx = ipr.link_lookup(ifname=name)[0]
+            # Attach interfaces
+            for iface in ifaces:
+                port = ipr.link_lookup(ifname=iface)[0]
+                ipr.link('set', index=port, master=idx)
+            # Put the bridge up
+            ipr.link('set', index=idx, state='up')
+            return idx
 
     def _bond_or_team(self, kind, name, *ifaces):
         """Create a bond or a team."""
-        ipr = pyroute2.RawIPRoute()
-        # Create the bond
-        ipr.link('add',
-                 ifname=name,
-                 kind=kind)
-        idx = ipr.link_lookup(ifname=name)[0]
-        # Attach interfaces
-        for iface in ifaces:
-            slave = ipr.link_lookup(ifname=iface)[0]
-            ipr.link('set', index=slave, state='down')
-            ipr.link('set', index=slave, master=idx)
-        # Put the bond up
-        ipr.link('set', index=idx, state='up')
-        return idx
+        with pyroute2.RawIPRoute() as ipr:
+            # Create the bond
+            ipr.link('add',
+                     ifname=name,
+                     kind=kind)
+            idx = ipr.link_lookup(ifname=name)[0]
+            # Attach interfaces
+            for iface in ifaces:
+                slave = ipr.link_lookup(ifname=iface)[0]
+                ipr.link('set', index=slave, state='down')
+                ipr.link('set', index=slave, master=idx)
+            # Put the bond up
+            ipr.link('set', index=idx, state='up')
+            return idx
 
     def team(self, name, *ifaces):
         """Create a team."""
@@ -115,63 +115,63 @@ class LinksFactory(object):
 
     def dummy(self, name):
         """Create a dummy interface."""
-        ipr = pyroute2.IPRoute()
-        ipr.link('add', ifname=name, kind='dummy')
-        idx = ipr.link_lookup(ifname=name)[0]
-        ipr.link('set', index=idx, state='up')
-        return idx
+        with pyroute2.IPRoute() as ipr:
+            ipr.link('add', ifname=name, kind='dummy')
+            idx = ipr.link_lookup(ifname=name)[0]
+            ipr.link('set', index=idx, state='up')
+            return idx
 
     def vlan(self, name, id, iface):
         """Create a VLAN."""
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=iface)[0]
-        ipr.link('add',
-                 ifname=name,
-                 kind='vlan',
-                 vlan_id=id,
-                 link=idx)
-        idx = ipr.link_lookup(ifname=name)[0]
-        ipr.link('set', index=idx, state='up')
-        return idx
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=iface)[0]
+            ipr.link('add',
+                     ifname=name,
+                     kind='vlan',
+                     vlan_id=id,
+                     link=idx)
+            idx = ipr.link_lookup(ifname=name)[0]
+            ipr.link('set', index=idx, state='up')
+            return idx
 
     def bridge_vlan(self, iface, vid, tagged=True, pvid=False, remove=False):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=iface)[0]
-        flags = []
-        if not tagged:
-            flags.append('untagged')
-        if pvid:
-            flags.append('pvid')
-        if not remove:
-            ipr.vlan_filter('del', index=idx, vlan_info={"vid": 1})
-        ipr.vlan_filter('add' if not remove else 'del', index=idx,
-                        vlan_info={'vid': vid,
-                                   'flags': flags})
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=iface)[0]
+            flags = []
+            if not tagged:
+                flags.append('untagged')
+            if pvid:
+                flags.append('pvid')
+            if not remove:
+                ipr.vlan_filter('del', index=idx, vlan_info={"vid": 1})
+            ipr.vlan_filter('add' if not remove else 'del', index=idx,
+                            vlan_info={'vid': vid,
+                                       'flags': flags})
 
     def up(self, name):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=name)[0]
-        ipr.link('set', index=idx, state='up')
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=name)[0]
+            ipr.link('set', index=idx, state='up')
 
     def down(self, name):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=name)[0]
-        ipr.link('set', index=idx, state='down')
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=name)[0]
+            ipr.link('set', index=idx, state='down')
 
     def remove(self, name):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=name)[0]
-        ipr.link('del', index=idx)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=name)[0]
+            ipr.link('del', index=idx)
 
     def unbridge(self, bridgename, name):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname=name)[0]
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
-        ifr = struct.pack("16si", b"br42", idx)
-        fcntl.ioctl(s,
-                    0x89a3,     # SIOCBRDELIF
-                    ifr)
-        s.close()
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname=name)[0]
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
+            ifr = struct.pack("16si", b"br42", idx)
+            fcntl.ioctl(s,
+                        0x89a3,     # SIOCBRDELIF
+                        ifr)
+            s.close()
 
 
 @pytest.fixture

diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py
index b8cd49b1faa489aa419fb20ce5a89aa61ae55bc7..c48ee24b6e6254b6c394c20ad0a85d8cc9527f44 100644 (file)
--- a/tests/integration/test_basic.py
+++ b/tests/integration/test_basic.py
@@ -185,9 +185,9 @@ def test_forced_unknown_management_address(lldpd1, lldpd, lldpcli, namespaces):
 
 def test_forced_known_management_address(lldpd1, lldpd, lldpcli, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
         lldpd("-m", "192.168.14.2")
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
@@ -197,10 +197,10 @@ def test_forced_known_management_address(lldpd1, lldpd, lldpcli, namespaces):
 
 def test_management_address(lldpd1, lldpd, lldpcli, links, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
-        ipr.addr('add', index=idx, address="172.25.21.47", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
+            ipr.addr('add', index=idx, address="172.25.21.47", mask=24)
         lldpd("-m", "172.25.*")
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
@@ -211,11 +211,11 @@ def test_management_address(lldpd1, lldpd, lldpcli, links, namespaces):
 def test_management_interface(lldpd1, lldpd, lldpcli, links, namespaces):
     links(namespaces(1), namespaces(2), 4)
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
-        idx = ipr.link_lookup(ifname="eth3")[0]
-        ipr.addr('add', index=idx, address="172.25.21.47", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
+            idx = ipr.link_lookup(ifname="eth3")[0]
+            ipr.addr('add', index=idx, address="172.25.21.47", mask=24)
         lldpd("-m", "eth3")
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
@@ -226,9 +226,9 @@ def test_management_interface(lldpd1, lldpd, lldpcli, links, namespaces):
 
 def test_change_management_address(lldpd1, lldpd, lldpcli, links, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
         lldpd("-m", "192.168.*")
         # We need a short TX interval as updating the IP address
         # doesn't trigger a resend.
@@ -238,8 +238,9 @@ def test_change_management_address(lldpd1, lldpd, lldpcli, links, namespaces):
         assert out["lldp.eth0.chassis.mgmt-ip"] == "192.168.14.2"
         assert out["lldp.eth0.chassis.mgmt-iface"] == "2"
     with namespaces(2):
-        ipr.addr('del', index=idx, address="192.168.14.2", mask=24)
-        ipr.addr('add', index=idx, address="192.168.14.5", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            ipr.addr('del', index=idx, address="192.168.14.2", mask=24)
+            ipr.addr('add', index=idx, address="192.168.14.5", mask=24)
         time.sleep(5)
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
@@ -260,9 +261,9 @@ def test_portid_subtype_ifname(lldpd1, lldpd, lldpcli, namespaces):
 
 def test_portid_subtype_with_alias(lldpd1, lldpd, lldpcli, links, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.link('set', index=idx, ifalias="alias of eth1")
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.link('set', index=idx, ifalias="alias of eth1")
         lldpd()
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
@@ -272,9 +273,9 @@ def test_portid_subtype_with_alias(lldpd1, lldpd, lldpcli, links, namespaces):
 
 def test_portid_subtype_macaddress(lldpd1, lldpd, lldpcli, links, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.link('set', index=idx, ifalias="alias of eth1")
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.link('set', index=idx, ifalias="alias of eth1")
         lldpd()
         lldpcli("configure", "lldp", "portidsubtype", "macaddress")
         time.sleep(3)
@@ -318,9 +319,9 @@ def test_portdescription(lldpd1, lldpd, lldpcli, namespaces):
 
 def test_portid_subtype_local_with_alias(lldpd1, lldpd, lldpcli, namespaces):
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.link('set', index=idx, ifalias="alias of eth1")
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.link('set', index=idx, ifalias="alias of eth1")
         lldpd()
         lldpcli("configure", "lldp", "portidsubtype", "local", "localname")
         time.sleep(3)
@@ -405,9 +406,9 @@ def test_port_vlan_tx(lldpd1, lldpd, lldpcli, namespaces):
         # unconfigure VLAN TX
         lldpcli("unconfigure", "ports", "eth0", "lldp", "vlan-tx")
         out = lldpcli("-f", "keyvalue", "show", "interfaces", "ports", "eth0")
-        assert not "lldp.eth0.port.vlanTX.id" in out
-        assert not "lldp.eth0.port.vlanTX.prio" in out
-        assert not "lldp.eth0.port.vlanTX.dei" in out
+        assert "lldp.eth0.port.vlanTX.id" not in out
+        assert "lldp.eth0.port.vlanTX.prio" not in out
+        assert "lldp.eth0.port.vlanTX.dei" not in out
 
 
 def test_set_interface_alias(lldpd1, lldpd, lldpcli, namespaces):
@@ -416,9 +417,9 @@ def test_set_interface_alias(lldpd1, lldpd, lldpcli, namespaces):
     with namespaces(2):
         lldpd()
     with namespaces(1):
-        ipr = pyroute2.IPRoute()
-        link = ipr.link('get', ifname='eth0')[0]
-        assert link.get_attr('IFLA_IFALIAS') == 'lldpd: connected to ns-2.example.com'
+        with pyroute2.IPRoute() as ipr:
+            link = ipr.link('get', ifname='eth0')[0]
+            assert link.get_attr('IFLA_IFALIAS') == 'lldpd: connected to ns-2.example.com'
 
 
 def test_lldpdu_shutdown(lldpd, lldpcli, namespaces, links):

diff --git a/tests/integration/test_interfaces.py b/tests/integration/test_interfaces.py
index fb18748dcf63a1b2a315886662c88676168f6632..064855de56216bbb057612366c2e128ab4017bd0 100644 (file)
--- a/tests/integration/test_interfaces.py
+++ b/tests/integration/test_interfaces.py
@@ -144,10 +144,10 @@ def test_bond(lldpd1, lldpd, lldpcli, namespaces, links, when):
         if when == 'after':
             lldpd()
         idx = links.bond('bond42', 'eth3', 'eth1')
-        ipr = pyroute2.IPRoute()
-        # The bond has the MAC of eth3
-        assert ipr.get_links(idx)[0].get_attr('IFLA_ADDRESS') == \
-            "00:00:00:00:00:04"
+        with pyroute2.IPRoute() as ipr:
+            # The bond has the MAC of eth3
+            assert ipr.get_links(idx)[0].get_attr('IFLA_ADDRESS') == \
+                "00:00:00:00:00:04"
         if when == 'before':
             lldpd()
         else:

diff --git a/tests/integration/test_protocols.py b/tests/integration/test_protocols.py
index 1dc3ed0d4c3f7b3297180a9f60a0bb41d50038ab..b47327dee179f32de614102d090a538cb8b3d2af 100644 (file)
--- a/tests/integration/test_protocols.py
+++ b/tests/integration/test_protocols.py
@@ -70,9 +70,9 @@ def test_sonmp(lldpd, lldpcli, links, namespaces):
     with namespaces(1):
         lldpd("-s", "-ll", "-r")
     with namespaces(2):
-        ipr = pyroute2.IPRoute()
-        idx = ipr.link_lookup(ifname="eth1")[0]
-        ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
+        with pyroute2.IPRoute() as ipr:
+            idx = ipr.link_lookup(ifname="eth1")[0]
+            ipr.addr('add', index=idx, address="192.168.14.2", mask=24)
         lldpd("-ss", "-ll")
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")